From 284e12348d18cbbc49529dbb9743912fb47a001f Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Sat, 23 Mar 2024 21:46:14 +0800 Subject: [PATCH] chore: logger: show caller --- kernel/src/entry.rs | 2 +- kernel/src/logging.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/src/entry.rs b/kernel/src/entry.rs index bce2a9b..2cb859a 100644 --- a/kernel/src/entry.rs +++ b/kernel/src/entry.rs @@ -9,7 +9,7 @@ use crate::plat::timer::{Timer, TimerOps}; use crate::plat::trap::{Trap, TrapOps}; #[thread_local] -static HART_ID: Cell = Cell::new(0); +pub static HART_ID: Cell = Cell::new(0); #[no_mangle] pub extern "C" fn rust_main(hart_id: usize, device_tree_addr: usize) -> ! { diff --git a/kernel/src/logging.rs b/kernel/src/logging.rs index 65181eb..3087e01 100644 --- a/kernel/src/logging.rs +++ b/kernel/src/logging.rs @@ -31,11 +31,13 @@ impl Log for SimpleLogger { RawConsole .write_fmt(format_args!( - "{}[{}] {}{}\n", - color_prefix, + "{color_prefix}[{}] [{}] {}{color_reset}\n", record.level(), + record + .module_path_static() + .or_else(|| record.module_path()) + .unwrap_or(""), record.args(), - color_reset )) .unwrap(); }