misc: cleanup

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/drivers/e1000.rs

@@ -617,7 +617,7 @@ impl NetworkDriver for Device {
                 return data;
             } else {
                 drop(e1000);
-                scheduler::get_scheduler().inner.await_io().unwrap();
+                scheduler::get_scheduler().await_io().unwrap();
             }
         }
     }

src/aero_kernel/src/drivers/lai.rs

@@ -51,7 +51,6 @@ impl lai::Host for LaiHost {
 
     fn sleep(&self, ms: u64) {
         scheduler::get_scheduler()
-            .inner
             .sleep(Some(ms as usize / 1000))
             .expect("lai: unexpected signal during sleep")
     }

src/aero_kernel/src/fs/epoll.rs

@@ -186,11 +186,9 @@ impl EPoll {
         }
 
         if timeout > 0 {
-            scheduler::get_scheduler()
-                .inner
-                .sleep(Some(timeout * 1_000_000))?;
+            scheduler::get_scheduler().sleep(Some(timeout * 1_000_000))?;
         } else {
-            scheduler::get_scheduler().inner.sleep(None)?;
+            scheduler::get_scheduler().sleep(None)?;
         }
 
         'search: loop {
@@ -227,7 +225,7 @@ impl EPoll {
                     break 'search;
                 }
 
-                scheduler::get_scheduler().inner.await_io()?;
+                scheduler::get_scheduler().await_io()?;
             }
         }
 

src/aero_kernel/src/logger.rs

@@ -69,7 +69,7 @@ impl log::Log for AeroLogger {
 
             if scheduler::is_initialized() {
                 // fetch the current task, grab the TID and PID.
-                if let Some(task) = scheduler::get_scheduler().inner.current_task_optional() {
+                if let Some(task) = scheduler::get_scheduler().current_task_optional() {
                     serial_print!(
                         "(tid={}, pid={}) ",
                         task.tid().as_usize(),

src/aero_kernel/src/syscall/fs.rs

@@ -697,7 +697,7 @@ fn do_poll(fds: &mut [PollFd], timeout: Option<&TimeSpec>) -> Result<usize, Sysc
     }
 
     'search: loop {
-        scheduler::get_scheduler().inner.await_io()?;
+        scheduler::get_scheduler().await_io()?;
 
         for (handle, index) in refds.iter() {
             let pollfd = &mut fds[*index];

src/aero_kernel/src/syscall/futex.rs

@@ -96,7 +96,7 @@ impl FutexContainer {
             let current_task = scheduler.current_task();
 
             futex.insert(current_task.clone());
-            scheduler.inner.await_io()?;
+            scheduler.await_io()?;
             futex.remove(&current_task);
 
             if futex.is_empty() {

src/aero_kernel/src/syscall/time.rs

@@ -31,7 +31,7 @@ const CLOCK_TYPE_MONOTONIC: usize = 1;
 pub fn sleep(timespec: &TimeSpec) -> Result<usize, SyscallError> {
     let duration = (timespec.tv_nsec as usize).div_ceil(1000000000) + timespec.tv_sec as usize;
 
-    scheduler::get_scheduler().inner.sleep(Some(duration))?;
+    scheduler::get_scheduler().sleep(Some(duration))?;
 
     Ok(0x00)
 }

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

@@ -18,6 +18,8 @@
 #[cfg(feature = "round-robin")]
 pub mod round_robin;
 
+use core::ops;
+
 use alloc::sync::Arc;
 
 use crate::arch::interrupts::{self, InterruptStack};
@@ -86,7 +88,7 @@ pub enum ExitStatus {
 
 pub struct Scheduler {
     tasks: TaskContainer,
-    pub inner: Arc<dyn SchedulerInterface>,
+    inner: Arc<dyn SchedulerInterface>,
 }
 
 impl Scheduler {
@@ -155,6 +157,14 @@ impl Scheduler {
     }
 }
 
+impl ops::Deref for Scheduler {
+    type Target = dyn SchedulerInterface;
+
+    fn deref(&self) -> &Self::Target {
+        &*self.inner
+    }
+}
+
 /// Get a reference to the active scheduler.
 pub fn get_scheduler() -> &'static Scheduler {
     SCHEDULER

src/aero_kernel/src/userland/task/mod.rs

@@ -667,7 +667,7 @@ impl Task {
     }
 
     pub fn wake_up(&self) {
-        scheduler::get_scheduler().inner.wake_up(self.this())
+        scheduler::get_scheduler().wake_up(self.this())
     }
 
     pub fn is_process_leader(&self) -> bool {

src/aero_kernel/src/utils/sync.rs

@@ -58,7 +58,7 @@ impl WaitQueue {
         // Wait until the future is completed.
         while !future(&mut lock) {
             core::mem::drop(lock); // Drop the IRQ lock and await for IO to complete.
-            scheduler.inner.await_io()?;
+            scheduler.await_io()?;
 
             // Re-acquire the lock.
             lock = mutex.lock_irq();
@@ -94,7 +94,7 @@ impl WaitQueue {
         let this = self.queue.lock_irq();
 
         for task in this.iter() {
-            scheduler.inner.wake_up(task.clone());
+            scheduler.wake_up(task.clone());
         }
     }
 
@@ -104,7 +104,7 @@ impl WaitQueue {
         let this: MutexGuard<Vec<Arc<Task>>> = self.queue.lock_irq();
 
         if let Some(task) = this.first() {
-            scheduler.inner.wake_up(task.clone());
+            scheduler.wake_up(task.clone());
         }
     }
 
@@ -168,7 +168,7 @@ impl<T> BMutex<T> {
                 return BMutexGuard { guard, mutex: self };
             }
 
-            let _ = scheduler::get_scheduler().inner.await_io();
+            let _ = scheduler::get_scheduler().await_io();
         }
     }
 }