mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
debugging of TcpStream Drop dropping too fast
so far only able to confirm the problem happens, no effective fixes yet.
This commit is contained in:
parent
17e9a210ef
commit
56f9c654c0
3 changed files with 55 additions and 6 deletions
|
|
@ -223,6 +223,9 @@ fn xmain() -> ! {
|
||||||
// is being accumulated.
|
// is being accumulated.
|
||||||
let mut tcp_tx_waiting: Vec<Option<WaitingSocket>> = Vec::new();
|
let mut tcp_tx_waiting: Vec<Option<WaitingSocket>> = Vec::new();
|
||||||
|
|
||||||
|
// socket handles waiting for writes to flush on close
|
||||||
|
let mut tcp_tx_closing: Vec<(SocketHandle, xous::MessageSender)> = Vec::new();
|
||||||
|
|
||||||
// When a client issues a Connect request, it will get placed here while the connection is
|
// When a client issues a Connect request, it will get placed here while the connection is
|
||||||
// being established.
|
// being established.
|
||||||
let mut tcp_connect_waiting: Vec<
|
let mut tcp_connect_waiting: Vec<
|
||||||
|
|
@ -650,12 +653,24 @@ fn xmain() -> ! {
|
||||||
respond_with_error(msg, NetError::Invalid);
|
respond_with_error(msg, NetError::Invalid);
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
iface.get_socket::<TcpSocket>(handle).close();
|
if !std_tcp_can_close(&tcp_tx_waiting, handle) {
|
||||||
iface.remove_socket(handle);
|
log::info!("def");
|
||||||
if let Some(response) = msg.body.memory_message_mut() {
|
tcp_tx_closing.push((handle, msg.sender));
|
||||||
response.buf.as_slice_mut::<u8>()[0] = 0;
|
} else {
|
||||||
} else if !msg.body.has_memory() && msg.body.is_blocking() {
|
let socket = iface.get_socket::<TcpSocket>(handle);
|
||||||
xous::return_scalar(msg.sender, 0).ok();
|
if socket.may_send() {
|
||||||
|
log::info!("imm");
|
||||||
|
socket.close();
|
||||||
|
iface.remove_socket(handle);
|
||||||
|
if let Some(response) = msg.body.memory_message_mut() {
|
||||||
|
response.buf.as_slice_mut::<u8>()[0] = 0;
|
||||||
|
} else if !msg.body.has_memory() && msg.body.is_blocking() {
|
||||||
|
xous::return_scalar(msg.sender, 0).ok();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log::info!("def2");
|
||||||
|
tcp_tx_closing.push((handle, msg.sender));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1425,6 +1440,26 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log::debug!("pump: tcp close");
|
||||||
|
if tcp_tx_closing.len() > 0 {
|
||||||
|
let mut closed = Vec::<usize>::new();
|
||||||
|
for (index, &(handle, sender)) in tcp_tx_closing.iter().enumerate() {
|
||||||
|
if std_tcp_can_close(&tcp_tx_waiting, handle) {
|
||||||
|
let socket = iface.get_socket::<TcpSocket>(handle);
|
||||||
|
if socket.may_send() {
|
||||||
|
socket.close();
|
||||||
|
iface.remove_socket(handle);
|
||||||
|
log::info!("deferred close, socket is not active");
|
||||||
|
xous::return_scalar(sender, 0).ok();
|
||||||
|
closed.push(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for &index in closed.iter().rev() {
|
||||||
|
tcp_tx_closing.remove(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// this block contains the ICMP Rx handler. Tx is initiated by an incoming message to the Net crate.
|
// this block contains the ICMP Rx handler. Tx is initiated by an incoming message to the Net crate.
|
||||||
log::trace!("pump: icmp");
|
log::trace!("pump: icmp");
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -259,3 +259,14 @@ pub(crate) fn std_tcp_peek(
|
||||||
body.buf.as_slice_mut::<u32>()[0] = 0;
|
body.buf.as_slice_mut::<u32>()[0] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn std_tcp_can_close(tx_waiting: &Vec<Option<WaitingSocket>>, handle: SocketHandle) -> bool {
|
||||||
|
for maybe_socket in tx_waiting.iter() {
|
||||||
|
if let Some(socket) = maybe_socket {
|
||||||
|
if socket.handle.0 == handle.0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
@ -180,6 +180,9 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
count += 1;
|
count += 1;
|
||||||
|
if count == 10 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue