Show target in logging, and fix console deadlock

Author: Jiajie Chen

kernel/Cargo.lock

@@ -61,7 +61,7 @@ isomorphic_drivers = { git = "https://github.com/rcore-os/isomorphic_drivers", f
 lazy_static = { version = "1.3", features = ["spin_no_std"] }
 smoltcp = { git = "https://github.com/rcore-os/smoltcp", default-features = false, features = ["alloc", "log", "proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" }
-rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "f09eae7" }
+rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "18402290", default-features = false }
 rcore-memory = { path = "../crate/memory" }
 rcore-thread = { git = "https://github.com/rcore-os/rcore-thread" }
 rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "33f86c47" }
@@ -79,8 +79,8 @@ x86_64 = "0.7"
 raw-cpuid = "6.0"
 uart_16550 = "0.2"
 pc-keyboard = "0.5"
-acpi = "0.3"
-aml_parser = "0.3"
+acpi = "0.4"
+aml = "0.4"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
 riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }

kernel/Cargo.toml

@@ -251,8 +251,8 @@ impl Framebuffer {
     }
 }
 
-use rcore_console::Rgb888;
 use rcore_console::embedded_graphics::prelude::*;
+use rcore_console::Rgb888;
 
 /// To be the backend of rCore `Console`
 impl Drawing<Rgb888> for Framebuffer {

kernel/src/drivers/gpu/fb.rs

@@ -65,14 +65,26 @@ impl Log for SimpleLogger {
         if !self.enabled(record.metadata()) {
             return;
         }
+
         if let Some(tid) = processor().tid_option() {
             print_in_color(
-                format_args!("[{:>5}][{}] {}\n", record.level(), tid, record.args()),
+                format_args!(
+                    "[{:>5}][{}][{}] {}\n",
+                    record.level(),
+                    tid,
+                    record.target(),
+                    record.args()
+                ),
                 level_to_color_code(record.level()),
             );
         } else {
             print_in_color(
-                format_args!("[{:>5}][-] {}\n", record.level(), record.args()),
+                format_args!(
+                    "[{:>5}][-][{}] {}\n",
+                    record.level(),
+                    record.target(),
+                    record.args()
+                ),
                 level_to_color_code(record.level()),
             );
         }
@@ -82,10 +94,10 @@ impl Log for SimpleLogger {
 
 fn level_to_color_code(level: Level) -> u8 {
     match level {
-        Level::Error => 31,     // Red
-        Level::Warn => 93,      // BrightYellow
-        Level::Info => 34,      // Blue
-        Level::Debug => 32,     // Green
-        Level::Trace => 90,     // BrightBlack
+        Level::Error => 31, // Red
+        Level::Warn => 93,  // BrightYellow
+        Level::Info => 34,  // Blue
+        Level::Debug => 32, // Green
+        Level::Trace => 90, // BrightBlack
     }
 }