From 0897bd8e754e88b4262881410c77e372fe258397 Mon Sep 17 00:00:00 2001
From: LoGin <longjin@DragonOS.org>
Date: Thu, 16 May 2024 17:32:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(log):=20=E4=BF=AE=E5=A4=8Dpr=20#814=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#821)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/crates/unified-init/src/lib.rs |  4 ++--
 kernel/src/filesystem/vfs/mod.rs      |  4 +---
 kernel/src/libs/printk.rs             | 15 ++++++---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/kernel/crates/unified-init/src/lib.rs b/kernel/crates/unified-init/src/lib.rs
index 770186d3..b4e75078 100644
--- a/kernel/crates/unified-init/src/lib.rs
+++ b/kernel/crates/unified-init/src/lib.rs
@@ -40,7 +40,7 @@ macro_rules! define_unified_initializer_slice {
         static $name: [::unified_init::UnifiedInitializer] = [..];
     };
     () => {
-        compile_kerror!(
+        compile_error!(
             "define_unified_initializer_slice! requires at least one argument: slice_name"
         );
     };
@@ -54,7 +54,7 @@ macro_rules! define_public_unified_initializer_slice {
         pub static $name: [::unified_init::UnifiedInitializer] = [..];
     };
     () => {
-        compile_kerror!(
+        compile_error!(
             "define_unified_initializer_slice! requires at least one argument: slice_name"
         );
     };
diff --git a/kernel/src/filesystem/vfs/mod.rs b/kernel/src/filesystem/vfs/mod.rs
index 52af901b..7bdbe47b 100644
--- a/kernel/src/filesystem/vfs/mod.rs
+++ b/kernel/src/filesystem/vfs/mod.rs
@@ -871,9 +871,7 @@ macro_rules! define_filesystem_maker_slice {
         pub static $name: [FileSystemMaker] = [..];
     };
     () => {
-        compile_kerror!(
-            "define_filesystem_maker_slice! requires at least one argument: slice_name"
-        );
+        compile_error!("define_filesystem_maker_slice! requires at least one argument: slice_name");
     };
 }
 
diff --git a/kernel/src/libs/printk.rs b/kernel/src/libs/printk.rs
index 01ae4854..65f63004 100644
--- a/kernel/src/libs/printk.rs
+++ b/kernel/src/libs/printk.rs
@@ -90,10 +90,10 @@ impl Logger {
 
 /// 内核自定义日志器
 ///
-/// todo: 完善他的功能，并且逐步把kinfo等宏，迁移到这个logger上面来。
-struct CustomLogger;
+/// todo: https://github.com/DragonOS-Community/DragonOS/issues/762
+struct KernelLogger;
 
-impl Log for CustomLogger {
+impl Log for KernelLogger {
     fn enabled(&self, _metadata: &log::Metadata) -> bool {
         // 这里可以自定义日志过滤规则
         true
@@ -112,10 +112,10 @@ impl Log for CustomLogger {
     }
 }
 
-impl CustomLogger {
+impl KernelLogger {
     fn iodisplay(record: &log::Record) {
         match record.level() {
-            Level::Debug | Level::Info => {
+            Level::Debug | Level::Info | Level::Trace => {
                 write!(PrintkWriter, "[ {} ] ", record.level(),)
             }
             Level::Error => {
@@ -124,9 +124,6 @@ impl CustomLogger {
             Level::Warn => {
                 write!(PrintkWriter, "\x1B[1;33m[ WARN ] \x1B[0m",)
             }
-            Level::Trace => {
-                todo!()
-            }
         }
         .unwrap();
         writeln!(
@@ -185,7 +182,7 @@ impl CustomLogger {
 }
 
 pub fn early_init_logging() {
-    log::set_logger(&CustomLogger).unwrap();
+    log::set_logger(&KernelLogger).unwrap();
     log::set_max_level(log::LevelFilter::Debug);
     info!("Logging initialized");
 }