pf: add LOG_PF_PTABLE to log the ptable on pf

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

Author: Andy-Python-Programmer

src/aero_kernel/src/arch/x86_64/interrupts/exceptions.rs

@@ -26,6 +26,8 @@ use crate::unwind;
 use crate::userland::scheduler;
 use crate::utils::io;
 
+const LOG_PF_PTABLE: bool = true;
+
 macro interrupt_exception(fn $name:ident() => $message:expr) {
     pub fn $name(stack: &mut InterruptErrorStack) {
         unwind::prepare_panic();
@@ -110,7 +112,7 @@ pub(super) fn page_fault(stack: &mut InterruptErrorStack) {
             let task = scheduler::get_scheduler().current_task();
 
             log::error!(
-                "process: (pid={}, pid={})",
+                "process: (tid={}, pid={})",
                 task.tid().as_usize(),
                 task.pid().as_usize()
             );
@@ -121,8 +123,12 @@ pub(super) fn page_fault(stack: &mut InterruptErrorStack) {
                     .expect("userland application does not have a path set")
             );
 
-            scheduler::get_scheduler().current_task().vm.log();
-            scheduler::get_scheduler().current_task().file_table.log();
+            task.vm.log();
+            task.file_table.log();
+
+            if LOG_PF_PTABLE {
+                scheduler::get_scheduler().log_ptable();
+            }
 
             unwind::unwind_stack_trace();
 

src/aero_kernel/src/syscall/process.rs

@@ -48,7 +48,7 @@ pub fn exit(status: usize) -> ! {
             status = status
         );
 
-        scheduler::get_scheduler().inner.exit(status as isize);
+        scheduler::get_scheduler().exit(status as isize);
     }
 }
 

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

@@ -20,6 +20,7 @@
 #[cfg(feature = "round-robin")]
 pub mod round_robin;
 
+use alloc::string::String;
 use alloc::sync::Arc;
 
 use crate::apic;
@@ -59,25 +60,20 @@ pub trait SchedulerInterface: Send + Sync + Downcastable {
     fn exit(&self, status: isize) -> !;
 }
 
-/// Container or a transparent struct containing a hashmap of all of the taskes
-/// in the scheduler's queue protected by mutex. The hashmap has a key
-/// of `ProcessId` and a value of a reference-counting pointer
-/// to the task or task.
-#[repr(transparent)]
 struct TaskContainer(Mutex<hashbrown::HashMap<TaskId, Arc<Task>>>);
 
 impl TaskContainer {
-    /// Creates a new task container with no taskes by default.
-    #[inline]
     fn new() -> Self {
         Self(Mutex::new(hashbrown::HashMap::new()))
     }
 
-    /// Registers the provided `task` in the task container.
-    #[inline]
     fn register_task(&self, task_id: TaskId, task: Arc<Task>) {
         self.0.lock().insert(task_id, task);
     }
+
+    fn remove_task(&self, task: Arc<Task>) {
+        self.0.lock().remove(&task.pid());
+    }
 }
 
 unsafe impl Send for TaskContainer {}
@@ -120,6 +116,22 @@ impl Scheduler {
         self.inner.current_task()
     }
 
+    pub fn exit(&self, status: isize) -> ! {
+        let current_task = self.inner.current_task();
+        self.tasks.remove_task(current_task);
+
+        self.inner.exit(status)
+    }
+
+    pub fn log_ptable(&self) {
+        self.tasks.0.lock().iter().for_each(|(pid, task)| {
+            log::info!(
+                "task(pid={pid:?}, path={:?})",
+                task.path().unwrap_or(String::from("<unknown>"))
+            )
+        });
+    }
+
     /// Lookup a task by ID
     #[inline]
     pub fn find_task(&self, task_id: TaskId) -> Option<Arc<Task>> {

src/aero_kernel/src/userland/signals.rs

@@ -81,7 +81,7 @@ mod default {
     ];
 
     fn terminate() {
-        scheduler::get_scheduler().inner.exit(1);
+        scheduler::get_scheduler().exit(1);
     }
 
     fn terminate_thread() {
@@ -421,7 +421,7 @@ pub fn check_for_signals() -> Option<(usize, SignalEntry)> {
     // Check if a SIGKILL is pending, and if so, kill the task.
     if signals.is_pending(SIGKILL as u64) {
         signals.clear_pending(SIGKILL as u64);
-        scheduler::get_scheduler().inner.exit(1);
+        scheduler::get_scheduler().exit(1);
     }
 
     for i in 0..SIGNAL_COUNT {