fix: The timer sequence stuck in infinite loop after series of delete operation

[lunaix-os.git] / lunaix-os / kernel / sched.c

diff --git a/lunaix-os/kernel/sched.c b/lunaix-os/kernel/sched.c
index 8f65087f8253175f0a2dd2f4f26ab34afd718a4a..442921ebccfb444fd13d1374988f5fdbe7cef108 100644 (file)
--- a/lunaix-os/kernel/sched.c
+++ b/lunaix-os/kernel/sched.c
@@ -70,6 +70,8 @@ schedule()
         return;
     }
 
         return;
     }
 

+    // 上下文切换相当的敏感！我们不希望任何的中断打乱栈的顺序……
+    cpu_disable_interrupt();

     struct proc_info* next;
     int prev_ptr = sched_ctx.procs_index;
     int ptr = prev_ptr;
     struct proc_info* next;
     int prev_ptr = sched_ctx.procs_index;
     int ptr = prev_ptr;


@@ -97,6 +99,7 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
     if (!seconds) {
         return 0;
     }
     if (!seconds) {
         return 0;
     }

+

     if (__current->timer) {
         return __current->timer->counter / timer_context()->running_frequency;
     }
     if (__current->timer) {
         return __current->timer->counter / timer_context()->running_frequency;
     }


@@ -119,26 +122,54 @@ __DEFINE_LXSYSCALL(void, yield)
     schedule();
 }
 
     schedule();
 }
 

+pid_t
+_wait(pid_t wpid, int* status, int options);
+

 __DEFINE_LXSYSCALL1(pid_t, wait, int*, status)
 __DEFINE_LXSYSCALL1(pid_t, wait, int*, status)

+{
+    return _wait(-1, status, 0);
+}
+
+__DEFINE_LXSYSCALL3(pid_t, waitpid, pid_t, pid, int*, status, int, options)
+{
+    return _wait(pid, status, options);
+}
+
+pid_t
+_wait(pid_t wpid, int* status, int options)

 {
     pid_t cur = __current->pid;
 {
     pid_t cur = __current->pid;

+    int status_flags = 0;

     struct proc_info *proc, *n;
     if (llist_empty(&__current->children)) {
         return -1;
     }
     struct proc_info *proc, *n;
     if (llist_empty(&__current->children)) {
         return -1;
     }

+
+    cpu_enable_interrupt();

 repeat:
     llist_for_each(proc, n, &__current->children, siblings)
     {
 repeat:
     llist_for_each(proc, n, &__current->children, siblings)
     {

-        if (proc->state == PROC_TERMNAT) {
-            goto done;
+        if (!~wpid || proc->pid == wpid) {
+            if (proc->state == PROC_TERMNAT && !options) {
+                status_flags |= PROCTERM;
+                goto done;
+            }
+            if (proc->state == PROC_STOPPED && (options & WUNTRACED)) {
+                status_flags |= PROCSTOP;
+                goto done;
+            }

         }
     }
         }
     }

-    // FIXME: 除了循环，也许有更高效的办法……
-    // (在这里进行schedule，需要重写context switch!)
+    if ((options & WNOHANG)) {
+        return 0;
+    }
+    // 放弃当前的运行机会
+    sched_yield();

     goto repeat;
 
 done:
     goto repeat;
 
 done:

-    *status = proc->exit_code;
+    cpu_disable_interrupt();
+    *status = (proc->exit_code & 0xffff) | status_flags;

     return destroy_process(proc->pid);
 }
 
     return destroy_process(proc->pid);
 }