From 008a8eb336a4a3e271ac7c12b417db2a149a99e1 Mon Sep 17 00:00:00 2001
From: able <abl3theabove@gmail.com>
Date: Wed, 13 Sep 2023 02:19:37 -0500
Subject: [PATCH] More tracing

---
 kernel/src/arch/aarch64/mod.rs                  | 2 ++
 kernel/src/arch/x86_64/device_info_collector.rs | 1 +
 kernel/src/arch/x86_64/mod.rs                   | 2 +-
 kernel/src/kmain.rs                             | 4 +++-
 kernel/src/logger.rs                            | 2 +-
 kernel/src/task.rs                              | 2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/kernel/src/arch/aarch64/mod.rs b/kernel/src/arch/aarch64/mod.rs
index 9bc405de..0aad2c72 100644
--- a/kernel/src/arch/aarch64/mod.rs
+++ b/kernel/src/arch/aarch64/mod.rs
@@ -32,3 +32,5 @@ pub fn spin_loop() -> ! {
 pub fn hardware_random_u64() -> u64 {
     0
 }
+
+pub fn register_dump() {}
diff --git a/kernel/src/arch/x86_64/device_info_collector.rs b/kernel/src/arch/x86_64/device_info_collector.rs
index 4430f3aa..4cea5ebc 100644
--- a/kernel/src/arch/x86_64/device_info_collector.rs
+++ b/kernel/src/arch/x86_64/device_info_collector.rs
@@ -53,6 +53,7 @@ fn collect_cpu_info(device_tree: &mut DeviceTree) {
 }
 
 pub fn collect_device_info() {
+    log::trace!("Collecting devices on x86_64");
     // Lock device tree
     unsafe {
         DEVICE_TREE.force_unlock();
diff --git a/kernel/src/arch/x86_64/mod.rs b/kernel/src/arch/x86_64/mod.rs
index 14c95ad4..16ec21d1 100644
--- a/kernel/src/arch/x86_64/mod.rs
+++ b/kernel/src/arch/x86_64/mod.rs
@@ -45,7 +45,6 @@ unsafe extern "C" fn _kernel_start() -> ! {
             .expect("tried to get physical memory mapping offset from Limine")
             .offset,
     ));
-
     allocator::init(INITIAL_KERNEL_HEAP_START, INITIAL_KERNEL_HEAP_SIZE as _);
 
     static MMAP_REQ: MemmapRequest = MemmapRequest::new(0);
@@ -115,6 +114,7 @@ unsafe extern "C" fn _kernel_start() -> ! {
     // TODO: Add in rdseed and rdrand as sources for randomness
     let _rand = xml::XMLElement::new("Random");
 
+    log::trace!("Getting boot modules");
     let bm = MOD_REQ.get_response().get();
 
     let mut bootmodules = alloc::vec::Vec::new();
diff --git a/kernel/src/kmain.rs b/kernel/src/kmain.rs
index 550fab23..a2e81093 100644
--- a/kernel/src/kmain.rs
+++ b/kernel/src/kmain.rs
@@ -33,7 +33,9 @@ pub fn kmain(cmdline: &str, boot_modules: BootModules) -> ! {
 
     let dt = DEVICE_TREE.lock();
 
-    info!("Device Tree: {}", dt);
+    // TODO(Able): This line causes a deadlock
+    // info!("Device Tree: {}", dt);
+
     info!("Boot complete. Moving to init_system");
 
     // TODO: schedule the disk driver from the initramfs
diff --git a/kernel/src/logger.rs b/kernel/src/logger.rs
index 486a3688..5f5ae656 100644
--- a/kernel/src/logger.rs
+++ b/kernel/src/logger.rs
@@ -4,7 +4,7 @@ use log::{Level, SetLoggerError};
 
 pub fn init() -> Result<(), SetLoggerError> {
     log::set_logger(&crate::logger::Logger)?;
-    log::set_max_level(log::LevelFilter::Debug);
+    log::set_max_level(log::LevelFilter::Trace);
     Ok(())
 }
 
diff --git a/kernel/src/task.rs b/kernel/src/task.rs
index ea39f849..4c603e16 100644
--- a/kernel/src/task.rs
+++ b/kernel/src/task.rs
@@ -106,6 +106,7 @@ struct Task {
 
 impl Task {
     pub fn new(future: impl Future<Output = ()> + Send + 'static) -> Self {
+        log::trace!("New task scheduled");
         Self {
             future: Box::pin(future),
         }
@@ -129,6 +130,7 @@ struct TaskWaker {
 
 impl Wake for TaskWaker {
     fn wake(self: Arc<Self>) {
+        log::trace!("Woke Task-{:?}", self.id);
         self.wake_by_ref();
     }