refactor(thread): 使用标准库方法优化栈分配计算

Author: moyanj

kernel/src/drivers/device.rs

@@ -52,6 +52,14 @@ impl OldDevice {
         }
     }
 
+    #[cfg(test)]
+    pub fn null() -> Self {
+        Self::new_auto_assign(
+            String::from("null"),
+            DeviceInner::Char(Arc::new(crate::drivers::TestDevice)),
+        )
+    }
+
     pub fn device_type(&self) -> DeviceType {
         self.shared_ops().device_type()
     }

kernel/src/main.rs

@@ -25,7 +25,6 @@ use proka_kernel::{libs::time::rtc, output::console::CONSOLE, BASE_REVISION};
 /* The Kernel main code */
 // The normal one
 #[unsafe(no_mangle)]
-
 pub extern "C" fn kernel_main() -> ! {
     // Check is limine version supported
     assert!(BASE_REVISION.is_supported(), "Limine version not supported");
@@ -64,7 +63,7 @@ pub extern "C" fn kernel_main() -> ! {
                 use proka_kernel::output::console::BITFONT_CURSOR_VISIBLE;
                 static TICKS: AtomicU64 = AtomicU64::new(0);
                 let t = TICKS.fetch_add(1, Ordering::Relaxed);
-                if t > 0 && t % 20 == 0 {
+                if t > 0 && t.is_multiple_of(20) {
                     unsafe {
                         let current = BITFONT_CURSOR_VISIBLE.load(Ordering::Relaxed);
                         BITFONT_CURSOR_VISIBLE.store(!current, Ordering::Relaxed);

kernel/src/output/dual.rs

@@ -8,7 +8,7 @@ macro_rules! print {
         {
             $crate::output::dual::_dual_print_serial(format_args!($($arg)*));
             // Always print to console
-            $crate::output::dual::_dual_print_console(format_args!($($arg)*))
+            $crate::output::dual::_dual_print_console(format_args!($($arg)*));
         }
     };
 }

kernel/src/process/scheduler.rs

@@ -3,8 +3,6 @@
 //! This module provides the integration between the thread scheduler
 //! and the kernel's interrupt system.
 
-use crate::println;
-
 use super::thread::{self, Context, Tid};
 use spin::Mutex;
 

kernel/src/process/thread.rs

@@ -10,8 +10,6 @@
 use alloc::vec::Vec;
 use x86_64::PhysAddr;
 
-use crate::println;
-
 /// Thread ID type
 
 pub type Tid = u16;
@@ -603,7 +601,7 @@ fn allocate_kernel_stack(size: usize) -> (usize, PhysAddr, usize) {
     use crate::memory::frame::FRAME_ALLOCATOR;
     use crate::memory::paging::phys_to_virt;
 
-    let pages = (size + 4095) / 4096;
+    let pages = size.div_ceil(4096);
 
     let frame = FRAME_ALLOCATOR
         .allocate_contiguous(pages)
@@ -647,15 +645,4 @@ mod tests {
         assert_eq!(queue.dequeue(), Some(3)); // priority 20
         assert_eq!(queue.dequeue(), None);
     }
-
-    #[test_case]
-    fn test_thread_state() {
-        let stack_info = (0xFFFF800000000000usize, PhysAddr::new(0), 1usize);
-        let tcb = ThreadControlBlock::new_kernel(1, 10, idle_thread, stack_info);
-
-        assert_eq!(tcb.tid, 1);
-        assert_eq!(tcb.priority, 10);
-        assert!(tcb.is_runnable());
-        assert!(!tcb.is_blocked());
-    }
 }