X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/b60166b327a9108b07e3069fa6568a451529ffd9..refs/heads/nov/multiuser:/lunaix-os/kernel/ds/waitq.c

diff --git a/lunaix-os/kernel/ds/waitq.c b/lunaix-os/kernel/ds/waitq.c
index c9fb88f..e67c44d 100644
--- a/lunaix-os/kernel/ds/waitq.c
+++ b/lunaix-os/kernel/ds/waitq.c
@@ -2,29 +2,59 @@
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>
+#include <lunaix/kpreempt.h>
 
-void
-pwait(waitq_t* queue)
+static inline void must_inline
+__try_wait(bool check_stall) 
+{
+    unsigned int nstall;
+    waitq_t* current_wq = &current_thread->waitqueue;
+    if (waitq_empty(current_wq)) {
+        return;
+    }
+
+    block_current_thread();
+
+    if (!check_stall) {
+        // if we are not checking stall, we give up voluntarily
+        yield_current();
+    } else {
+        // otherwise, treat it as being preempted by kernel
+        preempt_current();
+    }
+
+    // In case of SIGINT-forced awaken
+    llist_delete(&current_wq->waiters);
+}
+
+static inline void must_inline
+__pwait(waitq_t* queue, bool check_stall)
 {
-    assert(current_thread);
     // prevent race condition.
-    cpu_disable_interrupt();
+    no_preemption();
 
-    waitq_t* current_wq = &current_thread->waitqueue;
-    assert(llist_empty(&current_wq->waiters));
+    prepare_to_wait(queue);
+    __try_wait(check_stall);
 
-    llist_append(&queue->waiters, &current_wq->waiters);
+    set_preemption();
+}
 
-    block_current_thread();
-    sched_pass();
+void
+pwait(waitq_t* queue)
+{
+    __pwait(queue, false);
+}
 
-    cpu_enable_interrupt();
+void
+pwait_check_stall(waitq_t* queue)
+{
+    __pwait(queue, true);
 }
 
 void
 pwake_one(waitq_t* queue)
 {
-    if (llist_empty(&queue->waiters)) {
+    if (waitq_empty(queue)) {
         return;
     }
 
@@ -39,7 +69,7 @@ pwake_one(waitq_t* queue)
 void
 pwake_all(waitq_t* queue)
 {
-    if (llist_empty(&queue->waiters)) {
+    if (waitq_empty(queue)) {
         return;
     }
 
@@ -49,8 +79,34 @@ pwake_all(waitq_t* queue)
     {
         thread = container_of(pos, struct thread, waitqueue);
 
-        assert(thread->state == PS_BLOCKED);
-        thread->state = PS_READY;
+        if (thread->state == PS_BLOCKED) {
+            thread->state = PS_READY;
+        }
+        
+        // already awaken or killed by other event, just remove it
         llist_delete(&pos->waiters);
     }
-}
\ No newline at end of file
+}
+
+void
+prepare_to_wait(waitq_t* queue)
+{
+    assert(current_thread);
+    
+    waitq_t* current_wq = &current_thread->waitqueue;
+    assert(llist_empty(&current_wq->waiters));
+
+    llist_append(&queue->waiters, &current_wq->waiters);
+}
+
+void
+try_wait()
+{
+    __try_wait(false);
+}
+
+void
+try_wait_check_stall()
+{
+    __try_wait(true);
+}