From 2faa518df8e8a0a7dd3381390bc58c13c0ce1408 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 3 Oct 2023 17:18:07 +0800 Subject: [PATCH] add debug level setting on net stack --- services/net/src/api.rs | 1 + services/net/src/lib.rs | 12 ++++++++++++ services/net/src/main.rs | 8 ++++++++ services/shellchat/src/nettests.rs | 5 +++++ 4 files changed, 26 insertions(+) diff --git a/services/net/src/api.rs b/services/net/src/api.rs index 76d764d5c..041420d64 100644 --- a/services/net/src/api.rs +++ b/services/net/src/api.rs @@ -38,6 +38,7 @@ pub const MIN_EC_REV: SemVer = SemVer { #[repr(C)] pub(crate) enum Opcode { SetupMpsc = 0, + SetDebug = 1, /// Calls for UDP implementation (now deprecated to libstd) //UdpBind = 0, //UdpClose = 1, diff --git a/services/net/src/lib.rs b/services/net/src/lib.rs index 9a140cd2b..681302e7d 100644 --- a/services/net/src/lib.rs +++ b/services/net/src/lib.rs @@ -59,6 +59,18 @@ impl NetManager { wifi_state_sid: None, } } + pub fn set_debug_level(&self, level: log::LevelFilter) { + let code = match level { + log::LevelFilter::Info => 0, + log::LevelFilter::Debug => 1, + log::LevelFilter::Trace => 2, + _ => 0, + }; + send_message( + self.netconn.conn(), + Message::new_scalar(Opcode::SetDebug.to_usize().unwrap(), code, 0, 0, 0), + ).expect("couldn't set debug"); + } pub fn get_ipv4_config(&self) -> Option { let storage = Some(Ipv4Conf::default().encode_u16()); let mut buf = Buffer::into_buf(storage).expect("Couldn't convert to memory structure"); diff --git a/services/net/src/main.rs b/services/net/src/main.rs index e7b85e283..d612f1f9e 100644 --- a/services/net/src/main.rs +++ b/services/net/src/main.rs @@ -385,6 +385,14 @@ fn main() -> ! { Some(Opcode::SetupMpsc) => { self_sender = Some(msg.sender.to_usize()); } + Some(Opcode::SetDebug) => msg_scalar_unpack!(msg, level, _, _, _, { + match level { + 0 => log::set_max_level(log::LevelFilter::Info), + 1 => log::set_max_level(log::LevelFilter::Debug), + 2 => log::set_max_level(log::LevelFilter::Trace), + _ => log::set_max_level(log::LevelFilter::Info), + } + }), Some(Opcode::Ping) => { log::debug!("Ping"); let mut buf = unsafe { diff --git a/services/shellchat/src/nettests.rs b/services/shellchat/src/nettests.rs index 08ed982e9..9497fcaa7 100644 --- a/services/shellchat/src/nettests.rs +++ b/services/shellchat/src/nettests.rs @@ -8,6 +8,7 @@ use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4}; use std::sync::atomic::{AtomicUsize, Ordering}; pub(crate) fn start_batch_tests() { + let netmgr = net::NetManager::new(); let _ = thread::spawn({ move || { let run_passing = false; @@ -106,10 +107,14 @@ pub(crate) fn start_batch_tests() { log::info!("################################################## clone_accept_smoke"); tt.sleep_ms(PRINT_DELAY).ok(); + netmgr.set_debug_level(log::LevelFilter::Trace); clone_accept_smoke(); + netmgr.set_debug_level(log::LevelFilter::Info); log::info!("################################################## clone_accept_concurrent"); tt.sleep_ms(PRINT_DELAY).ok(); + netmgr.set_debug_level(log::LevelFilter::Trace); clone_accept_concurrent(); + netmgr.set_debug_level(log::LevelFilter::Info); log::info!("################################################## multiple_connect_serial"); tt.sleep_ms(PRINT_DELAY).ok();