log: print the cur task's pid on log

print the current task's PID and TID on log if the scheduler is
initialized and the initial task has been initialized

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/logger.rs

@@ -24,6 +24,7 @@ use alloc::string::String;
 use log::{Level, LevelFilter, Metadata, Record};
 use spin::Once;
 
+use crate::userland::scheduler;
 use crate::utils::buffer::RingBuffer;
 use crate::utils::sync::Mutex;
 
@@ -71,6 +72,20 @@ impl log::Log for AeroLogger {
 
             serial_print!("\x1b[37;1m{file}:{line} ");
 
+            if scheduler::is_initialized() {
+                // fetch the current task, grab the TID and PID.
+                scheduler::get_scheduler()
+                    .inner
+                    .current_task_optional()
+                    .map(|task| {
+                        serial_print!(
+                            "(tid={}, pid={}) ",
+                            task.tid().as_usize(),
+                            task.pid().as_usize()
+                        );
+                    });
+            }
+
             match record.level() {
                 Level::Info => serial_print!("\x1b[32;1minfo "), // green info
                 Level::Warn => serial_print!("\x1b[33;1mwarn "), // yellow warn

src/aero_kernel/src/userland/scheduler/mod.rs

@@ -44,8 +44,12 @@ pub trait SchedulerInterface: Send + Sync + Downcastable {
     /// Register the provided task into the task scheduler queue.
     fn register_task(&self, task: Arc<Task>);
 
-    /// Get a reference-counting pointer to the current task.
-    fn current_task(&self) -> Arc<Task>;
+    fn current_task(&self) -> Arc<Task> {
+        self.current_task_optional()
+            .expect("current_task: current task not found")
+    }
+
+    fn current_task_optional(&self) -> Option<Arc<Task>>;
 
     fn init(&self);
     fn wake_up(&self, task: Arc<Task>);

src/aero_kernel/src/userland/scheduler/round_robin.rs

@@ -194,10 +194,8 @@ impl SchedulerInterface for RoundRobin {
         queue.push_runnable(task);
     }
 
-    fn current_task(&self) -> Arc<Task> {
-        let queue = self.queue.get();
-
-        queue.current_task.as_ref().unwrap().clone()
+    fn current_task_optional(&self) -> Option<Arc<Task>> {
+        self.queue.get().current_task.as_ref().cloned()
     }
 
     fn init(&self) {