feat(logging): print time

Author: mkroening

src/arch/aarch64/kernel/mod.rs

@@ -151,6 +151,7 @@ pub fn boot_processor_init() {
 	env::init();
 	interrupts::init();
 	processor::detect_frequency();
+	crate::logging::KERNEL_LOGGER.set_time(true);
 	processor::print_information();
 	systemtime::init();
 	#[cfg(feature = "pci")]

src/arch/riscv64/kernel/start.rs

@@ -50,6 +50,8 @@ unsafe extern "C" fn pre_init(hart_id: usize, boot_info: Option<&'static RawBoot
 	CURRENT_BOOT_ID.store(hart_id as u32, Ordering::Relaxed);
 
 	if CPU_ONLINE.load(Ordering::Acquire) == 0 {
+		crate::logging::KERNEL_LOGGER.set_time(true);
+
 		env::set_boot_info(*boot_info.unwrap());
 		let fdt = unsafe { Fdt::from_ptr(get_dtb_ptr()).expect("FDT is invalid") };
 		// Init HART_MASK

src/arch/x86_64/kernel/mod.rs

@@ -154,6 +154,7 @@ pub fn boot_processor_init() {
 	crate::mm::print_information();
 	CoreLocal::get().add_irq_counter();
 	env::init();
+	crate::logging::KERNEL_LOGGER.set_time(true);
 	gdt::add_current_core();
 	interrupts::load_idt();
 	pic::init();

src/logging.rs

@@ -1,12 +1,31 @@
 use core::fmt;
+use core::sync::atomic::{AtomicBool, Ordering};
 
 use anstyle::AnsiColor;
 use log::{Level, LevelFilter, Metadata, Record};
 
-pub static KERNEL_LOGGER: KernelLogger = KernelLogger;
+pub static KERNEL_LOGGER: KernelLogger = KernelLogger::new();
 
 /// Data structure to filter kernel messages
-pub struct KernelLogger;
+pub struct KernelLogger {
+	time: AtomicBool,
+}
+
+impl KernelLogger {
+	pub const fn new() -> Self {
+		Self {
+			time: AtomicBool::new(false),
+		}
+	}
+
+	pub fn time(&self) -> bool {
+		self.time.load(Ordering::Relaxed)
+	}
+
+	pub fn set_time(&self, time: bool) {
+		self.time.store(time, Ordering::Relaxed);
+	}
+}
 
 impl log::Log for KernelLogger {
 	fn enabled(&self, _: &Metadata<'_>) -> bool {
@@ -22,10 +41,28 @@ impl log::Log for KernelLogger {
 			return;
 		}
 
+		// FIXME: Use `super let` once stable
+		let time;
+		let format_time = if self.time() {
+			time = Microseconds(crate::processor::get_timer_ticks());
+			format_args!("[{time}]")
+		} else {
+			format_args!("[            ]")
+		};
 		let core_id = crate::arch::core_local::core_id();
 		let level = ColorLevel(record.level());
 		let args = record.args();
-		println!("[{core_id}][{level}] {args}");
+		println!("{format_time}[{core_id}][{level}] {args}");
+	}
+}
+
+struct Microseconds(u64);
+
+impl fmt::Display for Microseconds {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		let seconds = self.0 / 1_000_000;
+		let microseconds = self.0 % 1_000_000;
+		write!(f, "{seconds:5}.{microseconds:06}")
 	}
 }