Skip to content

Commit 1e82e53

Browse files
committed
logging: bugfix #137: Init log module to enable logging macros
1 parent d2ceaed commit 1e82e53

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

os/src/logging.rs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*!
2+
3+
本模块利用 log crate 为你提供了日志功能,使用方式见 main.rs.
4+
5+
*/
6+
7+
use log::{self, Level, LevelFilter, Log, Metadata, Record};
8+
9+
struct SimpleLogger;
10+
11+
impl Log for SimpleLogger {
12+
fn enabled(&self, _metadata: &Metadata) -> bool {
13+
true
14+
}
15+
fn log(&self, record: &Record) {
16+
if !self.enabled(record.metadata()) {
17+
return;
18+
}
19+
let color = match record.level() {
20+
Level::Error => 31, // Red
21+
Level::Warn => 93, // BrightYellow
22+
Level::Info => 34, // Blue
23+
Level::Debug => 32, // Green
24+
Level::Trace => 90, // BrightBlack
25+
};
26+
println!(
27+
"\u{1B}[{}m[{:>5}] {}\u{1B}[0m",
28+
color,
29+
record.level(),
30+
record.args(),
31+
);
32+
}
33+
fn flush(&self) {}
34+
}
35+
36+
pub fn init() {
37+
static LOGGER: SimpleLogger = SimpleLogger;
38+
log::set_logger(&LOGGER).unwrap();
39+
log::set_max_level(match option_env!("LOG") {
40+
Some("ERROR") => LevelFilter::Error,
41+
Some("WARN") => LevelFilter::Warn,
42+
Some("INFO") => LevelFilter::Info,
43+
Some("DEBUG") => LevelFilter::Debug,
44+
Some("TRACE") => LevelFilter::Trace,
45+
_ => LevelFilter::Info,
46+
});
47+
}

os/src/main.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#![feature(panic_info_message)]
2323

2424
use core::arch::global_asm;
25+
use log::*;
2526

2627
#[path = "boards/qemu.rs"]
2728
mod board;
@@ -31,6 +32,7 @@ mod console;
3132
mod config;
3233
mod lang_items;
3334
mod loader;
35+
mod logging;
3436
mod sbi;
3537
mod sync;
3638
pub mod syscall;
@@ -57,7 +59,8 @@ fn clear_bss() {
5759
#[no_mangle]
5860
pub fn rust_main() -> ! {
5961
clear_bss();
60-
println!("[kernel] Hello, world!");
62+
logging::init();
63+
info!("[kernel] Hello, world!");
6164
trap::init();
6265
loader::load_apps();
6366
trap::enable_timer_interrupt();

0 commit comments

Comments
 (0)