X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/3b6a05fc894d0c1a3d431045ee5a53955ba093a0..43c43c058ededea929645fef68d15820eed1f5e9:/lunaix-os/kernel/ds/waitq.c

diff --git a/lunaix-os/kernel/ds/waitq.c b/lunaix-os/kernel/ds/waitq.c
index 0d643d0..7045e36 100644
--- a/lunaix-os/kernel/ds/waitq.c
+++ b/lunaix-os/kernel/ds/waitq.c
@@ -5,14 +5,18 @@
 void
 pwait(waitq_t* queue)
 {
+    // prevent race condition.
+    cpu_disable_interrupt();
+
     waitq_t* current_wq = &__current->waitqueue;
     assert(llist_empty(&current_wq->waiters));
 
     llist_append(&queue->waiters, &current_wq->waiters);
 
-    // FIXME centralize the state change.
-    __current->state = PS_BLOCKED;
+    block_current();
     sched_yieldk();
+
+    cpu_enable_interrupt();
 }
 
 void
@@ -43,6 +47,7 @@ pwake_all(waitq_t* queue)
     {
         proc = container_of(pos, struct proc_info, waitqueue);
 
+        assert(proc->state == PS_BLOCKED);
         proc->state = PS_READY;
         llist_delete(&pos->waiters);
     }