Changes in kernel/generic/src/synch/waitq.c [b59318e:7c3fb9b] in mainline

File:

• kernel/generic/src/synch/waitq.c (modified) (6 diffs)

kernel/generic/src/synch/waitq.c

@@ -57 +57 @@
 #include <adt/list.h>
 #include <arch/cycle.h>
-#include <mem.h>
 
 static void waitq_sleep_timed_out(void *);
@@ -72 +71 @@
 void waitq_initialize(waitq_t *wq)
 {
-        memsetb(wq, sizeof(*wq), 0);
         irq_spinlock_initialize(&wq->lock, "wq.lock");
         list_initialize(&wq->sleepers);
+        wq->missed_wakeups = 0;
 }
 
@@ -115 +114 @@
                 thread->saved_context = thread->sleep_timeout_context;
                 do_wakeup = true;
-                if (thread->sleep_composable)
-                        wq->ignore_wakeups++;
                 thread->sleep_queue = NULL;
                 irq_spinlock_unlock(&wq->lock, false);
@@ -179 +176 @@
                 list_remove(&thread->wq_link);
                 thread->saved_context = thread->sleep_interruption_context;
-                if (thread->sleep_composable)
-                        wq->ignore_wakeups++;
                 do_wakeup = true;
                 thread->sleep_queue = NULL;
@@ -398 +393 @@
          */
         irq_spinlock_lock(&THREAD->lock, false);
-
-        THREAD->sleep_composable = (flags & SYNCH_FLAGS_FUTEX);
 
         if (flags & SYNCH_FLAGS_INTERRUPTIBLE) {
@@ -545 +538 @@
         assert(irq_spinlock_locked(&wq->lock));
 
-        if (wq->ignore_wakeups > 0) {
-                if (mode == WAKEUP_FIRST) {
-                        wq->ignore_wakeups--;
-                        return;
-                }
-                wq->ignore_wakeups = 0;
-        }
-
 loop:
         if (list_empty(&wq->sleepers)) {