软中断&定时器重构 (#223)

* 软中断&定时器重构

Co-authored-by: houmkh<houjiaying@DragonOS.org>

* 修改timer的clock()

* 删除debug信息

---------

Co-authored-by: houmkh <1119644616@qq.com>

kernel/src/driver/video/mod.rs

@@ -0,0 +1,62 @@
+use core::{ptr::null_mut, sync::atomic::{AtomicBool, Ordering}};
+
+use alloc::sync::Arc;
+
+use crate::{
+    exception::softirq::{SoftirqNumber, SoftirqVec, softirq_vectors},
+    include::bindings::bindings::video_refresh_framebuffer,
+};
+
+#[derive(Debug)]
+pub struct VideoRefreshFramebuffer{
+    running: AtomicBool
+}
+
+impl SoftirqVec for VideoRefreshFramebuffer {
+    fn run(&self) {
+        if self.set_run() == false{
+            return;
+        }
+        
+        unsafe {
+            video_refresh_framebuffer(null_mut());
+        }
+
+        self.clear_run();
+    }
+}
+impl VideoRefreshFramebuffer {
+    pub fn new() -> VideoRefreshFramebuffer {
+        VideoRefreshFramebuffer {
+            running: AtomicBool::new(false)
+        }
+    }
+
+    fn set_run(&self) -> bool {
+        let x = self
+            .running
+            .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed);
+        if x.is_ok() {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    fn clear_run(&self) {
+        self.running.store(false, Ordering::Release);
+    }
+}
+
+pub fn register_softirq_video() {
+    // kdebug!("register_softirq_video");
+    let handler = Arc::new(VideoRefreshFramebuffer::new());
+    softirq_vectors()
+        .register_softirq(SoftirqNumber::VideoRefresh, handler)
+        .expect("register_softirq_video run failed");
+}
+// ======= 以下为给C提供的接口,video重构完后请删除 =======
+#[no_mangle]
+pub extern "C" fn rs_register_softirq_video() {
+    register_softirq_video();
+}

kernel/src/driver/video/video.c

@@ -13,6 +13,8 @@
 #include <sched/sched.h>
 #include <time/timer.h>
 
+extern void rs_register_softirq_video();
+
 uint64_t video_refresh_expire_jiffies = 0;
 uint64_t video_last_refresh_pid = -1;
 
@@ -57,7 +59,7 @@ int video_refresh_daemon(void *unused)
 
     for (;;)
     {
-        if (clock() >= video_refresh_expire_jiffies)
+        if (rs_clock() >= video_refresh_expire_jiffies)
         {
 
             if (likely(video_refresh_target != NULL))
@@ -68,7 +70,7 @@ int video_refresh_daemon(void *unused)
                 spin_unlock(&daemon_refresh_lock);
                 video_daemon_pcb->virtual_runtime = 0xfffff0000000; // 临时解决由于显示刷新进程的虚拟运行时间过大/过小，导致其不运行，或者一直运行的问题。将来应使用实时调度解决它
             }
-            video_refresh_expire_jiffies = cal_next_n_ms_jiffies(REFRESH_INTERVAL << 1);
+            video_refresh_expire_jiffies = rs_timer_next_n_ms_jiffies(REFRESH_INTERVAL << 1);
         }
         video_daemon_pcb->state &= ~PROC_RUNNING;
         video_daemon_pcb->flags |= PF_NEED_SCHED;
@@ -85,7 +87,7 @@ void video_refresh_framebuffer(void *data)
 {
     if (unlikely(video_daemon_pcb == NULL))
         return;
-    if (clock() >= video_refresh_expire_jiffies)
+    if (rs_clock() >= video_refresh_expire_jiffies)
     {
         video_daemon_pcb->virtual_runtime = 0;
         process_wakeup(video_daemon_pcb);
@@ -105,18 +107,18 @@ int video_reinitialize(bool level) // 这个函数会在main.c调用, 保证 vid
         init_frame_buffer();
     else
     {
-        unregister_softirq(VIDEO_REFRESH_SIRQ);
+        rs_unregister_softirq(VIDEO_REFRESH_SIRQ);
         // 计算开始时间
-        video_refresh_expire_jiffies = cal_next_n_ms_jiffies(10 * REFRESH_INTERVAL);
+        video_refresh_expire_jiffies = rs_timer_next_n_ms_jiffies(10 * REFRESH_INTERVAL);
 
         // 创建video守护进程
         video_daemon_pcb = kthread_run(&video_refresh_daemon, NULL, "Video refresh daemon");
         video_daemon_pcb->virtual_runtime = 0; // 特殊情况， 最高优先级， 以后再改
 
         // 启用屏幕刷新软中断
-        register_softirq(VIDEO_REFRESH_SIRQ, &video_refresh_framebuffer, NULL);
+        rs_register_softirq_video();
 
-        raise_softirq(VIDEO_REFRESH_SIRQ);
+        rs_raise_softirq(VIDEO_REFRESH_SIRQ);
     }
     return 0;
 }
@@ -130,7 +132,7 @@ int video_reinitialize(bool level) // 这个函数会在main.c调用, 保证 vid
 int video_set_refresh_target(struct scm_buffer_info_t *buf)
 {
 
-    unregister_softirq(VIDEO_REFRESH_SIRQ);
+    rs_unregister_softirq(VIDEO_REFRESH_SIRQ);
     // todo: 在completion实现后，在这里等待其他刷新任务完成，再进行下一步。
 
     // int counter = 100;
@@ -138,12 +140,13 @@ int video_set_refresh_target(struct scm_buffer_info_t *buf)
     // while ((get_softirq_pending() & (1 << VIDEO_REFRESH_SIRQ)) && counter > 0)
     // {
     //     --counter;
-    //     usleep(1000);
+    //     rs_usleep(1000);
     // }
     // kdebug("buf = %#018lx", buf);
     video_refresh_target = buf;
-    register_softirq(VIDEO_REFRESH_SIRQ, &video_refresh_framebuffer, NULL);
-    raise_softirq(VIDEO_REFRESH_SIRQ);
+    rs_register_softirq_video();
+    kdebug("register softirq video done");
+    // rs_raise_softirq(VIDEO_REFRESH_SIRQ);
 }
 
 /**

kernel/src/driver/video/video.h

@@ -30,4 +30,4 @@ int video_set_refresh_target(struct scm_buffer_info_t *buf);
 extern uint64_t video_refresh_expire_jiffies;
 extern uint64_t video_last_refresh_pid;
 
-extern void video_refresh_framebuffer();
+void video_refresh_framebuffer(void *data);