From bd8afc6de7acb0e9c3b728c73bfd3b8a9c2d6ce6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 5 Aug 2022 15:50:11 +0800 Subject: [PATCH] clean up debug spew for merge to main --- services/net/src/device.rs | 6 +++--- services/net/src/main.rs | 6 +++--- services/net/src/std_tcpstream.rs | 2 +- services/shellchat/src/cmds/net_cmd.rs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/net/src/device.rs b/services/net/src/device.rs index 705031dc6..c837c9772 100644 --- a/services/net/src/device.rs +++ b/services/net/src/device.rs @@ -145,7 +145,7 @@ impl <'a> NetPhyTxToken<'a> { repr.emit(&mut packet); } let pkt = frame.into_inner().to_vec(); - log::info!("stuffing arp {:?}", pkt); + log::debug!("stuffing arp {:?}", pkt); self.com.wlan_queue_loopback(&pkt); self.loopback_rx(pkt.len()); } @@ -168,12 +168,12 @@ impl<'a> phy::TxToken for NetPhyTxToken<'a> { local_hwaddr[2..6].copy_from_slice(&MAC_ADDRESS_LSB.load(Ordering::SeqCst).to_be_bytes()); local_hwaddr[0..2].copy_from_slice(&MAC_ADDRESS_MSB.load(Ordering::SeqCst).to_be_bytes()); if frame.dst_addr() == EthernetAddress::default() { - log::info!("loopback packet redirect"); + log::debug!("loopback packet redirect"); // override the destination address to be our own address frame.set_dst_addr(smoltcp::wire::EthernetAddress(local_hwaddr)); loopback = true; } else if frame.dst_addr().as_bytes() == local_hwaddr { - log::info!("loopback return packet redirect"); + log::debug!("loopback return packet redirect"); loopback = true; } } diff --git a/services/net/src/main.rs b/services/net/src/main.rs index 768220ade..8a58e925a 100644 --- a/services/net/src/main.rs +++ b/services/net/src/main.rs @@ -193,7 +193,7 @@ fn setup_icmp(iface: &mut Interface::) -> SocketHandle { fn main() -> ! { log_server::init_wait().unwrap(); - log::set_max_level(log::LevelFilter::Debug); + log::set_max_level(log::LevelFilter::Info); log::info!("my PID is {}", xous::process::id()); let xns = xous_names::XousNames::new().unwrap(); @@ -1020,7 +1020,7 @@ fn main() -> ! { let socket = iface.get_socket::(*connection); let args = msg.body.scalar_message().unwrap(); let no_delay = args.arg1 != 0; - log::info!("setting nagle to {}", !no_delay); + log::warn!("Setting nagle to {}, see issue #210 about readback!", !no_delay); socket.set_nagle_enabled(!no_delay); xous::return_scalar(msg.sender, 0).ok(); } else { @@ -1705,7 +1705,7 @@ fn main() -> ! { tcp_server_remote_close_poll.retain(|x| { *x != *handle }); - log::info!("would return_scalar now"); + // log::info!("would return_scalar now"); xous::return_scalar(*sender, 0).ok(); false } else { diff --git a/services/net/src/std_tcpstream.rs b/services/net/src/std_tcpstream.rs index 40b9c1adf..0cd84880c 100644 --- a/services/net/src/std_tcpstream.rs +++ b/services/net/src/std_tcpstream.rs @@ -71,7 +71,7 @@ pub(crate) fn std_tcp_connect( tcp_connect_waiting, (msg, handle, idx, local_port, remote_port), ); - log::info!("connect waiting now: {}, {:?} {:?} {:?}", idx, handle, local_port, remote_port); + log::debug!("connect waiting now: {}, {:?} {:?} {:?}", idx, handle, local_port, remote_port); } pub(crate) fn std_tcp_tx( diff --git a/services/shellchat/src/cmds/net_cmd.rs b/services/shellchat/src/cmds/net_cmd.rs index ab33a158a..9c84d4dc3 100644 --- a/services/shellchat/src/cmds/net_cmd.rs +++ b/services/shellchat/src/cmds/net_cmd.rs @@ -1,4 +1,4 @@ -use crate::{ShellCmdApi, CommonEnv, nettests}; +use crate::{ShellCmdApi, CommonEnv}; use com::api::NET_MTU; use xous_ipc::String; #[cfg(any(target_os = "none", target_os = "xous"))] @@ -289,7 +289,7 @@ impl<'a> ShellCmdApi<'a> for NetCmd { } #[cfg(feature="nettest")] "test" => { - nettests::start_batch_tests(); + crate::nettests::start_batch_tests(); write!(ret, "Net batch tests started...").ok(); } #[cfg(feature="ditherpunk")]