Changeset b59318e in mainline for kernel/generic/src/synch/waitq.c

Timestamp:

2018-06-26T17:34:48Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ab6edb6

Parents:

f6372be9

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 17:01:43)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 17:34:48)

Message:

Make futex able to time out.

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 *);
@@ -71 +72 @@
 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;
 }
 
@@ -114 +115 @@
                 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);
@@ -176 +179 @@
                 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;
@@ -393 +398 @@
          */
         irq_spinlock_lock(&THREAD->lock, false);
+
+        THREAD->sleep_composable = (flags & SYNCH_FLAGS_FUTEX);
 
         if (flags & SYNCH_FLAGS_INTERRUPTIBLE) {
@@ -538 +545 @@
         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)) {