feat: serial device interfacing

[lunaix-os.git] / lunaix-os / kernel / ds / waitq.c

diff --git a/lunaix-os/kernel/ds/waitq.c b/lunaix-os/kernel/ds/waitq.c
index 5241a4ea9dff80bd64fb1f462ed4821cab9918f2..caed3bc6f498a11a705c990d060aab2637d5081f 100644 (file)
--- a/lunaix-os/kernel/ds/waitq.c
+++ b/lunaix-os/kernel/ds/waitq.c
@@ -1,19 +1,23 @@
 #include <lunaix/ds/waitq.h>
 #include <lunaix/process.h>
 #include <lunaix/ds/waitq.h>
 #include <lunaix/process.h>

-#include <lunaix/sched.h>

 #include <lunaix/spike.h>
 
 void
 pwait(waitq_t* queue)
 {
 #include <lunaix/spike.h>
 
 void
 pwait(waitq_t* queue)
 {

+    assert(__current);
+    // 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);
 
     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();
     sched_yieldk();

+
+    cpu_enable_interrupt();

 }
 
 void
 }
 
 void


@@ -44,6 +48,7 @@ pwake_all(waitq_t* queue)
     {
         proc = container_of(pos, struct proc_info, waitqueue);
 
     {
         proc = container_of(pos, struct proc_info, waitqueue);
 

+        assert(proc->state == PS_BLOCKED);

         proc->state = PS_READY;
         llist_delete(&pos->waiters);
     }
         proc->state = PS_READY;
         llist_delete(&pos->waiters);
     }