kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplifying TCP sockets

This commit is contained in:
Ryan Summers 2020-06-03 17:04:09 +02:00
parent fa5b1aa152
commit 7cb18cf197
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main.rs
View File

@ -576,15 +576,6 @@ const APP: () = {
sockets.add(tcp_socket) sockets.add(tcp_socket)
}; };
let mut rx_storage2 = [0; TCP_RX_BUFFER_SIZE];
let mut tx_storage2 = [0; TCP_TX_BUFFER_SIZE];
let tcp_handle1 = {
let tcp_rx_buffer = net::socket::TcpSocketBuffer::new(&mut rx_storage2[..]);
let tcp_tx_buffer = net::socket::TcpSocketBuffer::new(&mut tx_storage2[..]);
let tcp_socket = net::socket::TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
sockets.add(tcp_socket)
};
let mut server = server::Server::new(); let mut server = server::Server::new();
let mut time = 0u32; let mut time = 0u32;
@ -601,29 +592,9 @@ const APP: () = {
time += 1; time += 1;
} }
{
let mut socket = sockets.get::<net::socket::TcpSocket>(tcp_handle0);
if socket.state() == net::socket::TcpState::CloseWait {
socket.close();
} else if !(socket.is_open() || socket.is_listening()) {
socket
.listen(1234)
.unwrap_or_else(|e| warn!("TCP listen error: {:?}", e));
} else if tick && socket.can_send() {
let s = c.resources.iir_state.lock(|iir_state| server::Status {
t: time,
x0: iir_state[0][0],
y0: iir_state[0][2],
x1: iir_state[1][0],
y1: iir_state[1][2],
});
server::json_reply(&mut socket, &s);
}
}
{ {
let socket = let socket =
&mut *sockets.get::<net::socket::TcpSocket>(tcp_handle1); &mut *sockets.get::<net::socket::TcpSocket>(tcp_handle0);
if socket.state() == net::socket::TcpState::CloseWait { if socket.state() == net::socket::TcpState::CloseWait {
socket.close(); socket.close();
} else if !(socket.is_open() || socket.is_listening()) { } else if !(socket.is_open() || socket.is_listening()) {
@ -635,12 +606,33 @@ const APP: () = {
info!("Got request: {:?}", req); info!("Got request: {:?}", req);
route_request!(req, route_request!(req,
readable_attributes: [ readable_attributes: [
("stabilizer/afe0/gain", (|| Ok::<afe::Gain, ()>(c.resources.afe0.get_gain()))), ("stabilizer/iir/state", (|| {
("stabilizer/afe1/gain", (|| Ok::<afe::Gain, ()>(c.resources.afe1.get_gain()))) let state = c.resources.iir_state.lock(|iir_state|
server::Status {
t: time,
x0: iir_state[0][0],
y0: iir_state[0][2],
x1: iir_state[1][0],
y1: iir_state[1][2],
});
Ok::<server::Status, ()>(state)
})),
("stabilizer/afe0/gain", (|| {
Ok::<afe::Gain, ()>(c.resources.afe0.get_gain())
})),
("stabilizer/afe1/gain", (|| {
Ok::<afe::Gain, ()>(c.resources.afe1.get_gain())
}))
], ],
modifiable_attributes: [ modifiable_attributes: [
("stabilizer/afe0/gain", afe::Gain, (|gain| Ok::<(), ()>(c.resources.afe0.set_gain(gain)))), ("stabilizer/afe0/gain", afe::Gain, (|gain| {
("stabilizer/afe1/gain", afe::Gain, (|gain| Ok::<(), ()>(c.resources.afe1.set_gain(gain)))) Ok::<(), ()>(c.resources.afe0.set_gain(gain))
})),
("stabilizer/afe1/gain", afe::Gain, (|gain| {
Ok::<(), ()>(c.resources.afe1.set_gain(gain))
}))
] ]
) )
}); });