Changes in kernel/generic/include/synch/waitq.h [597fa24:d314571] in mainline

File:

• kernel/generic/include/synch/waitq.h (modified) (2 diffs)

kernel/generic/include/synch/waitq.h

@@ -41 +41 @@
 #include <adt/list.h>
 
-#define WAITQ_INITIALIZER_WITH_COUNT(name, count) (waitq_t) { \
-        .lock = IRQ_SPINLOCK_INITIALIZER(#name ".lock"), \
-        .sleepers = LIST_INITIALIZER((name).sleepers), \
-        .wakeup_balance = (count), \
-}
-
-#define WAITQ_INITIALIZER(name) WAITQ_INITIALIZER_WITH_COUNT(name, 0)
-
-#define WAITQ_INITIALIZE_WITH_COUNT(name, count) \
-        waitq_t name = WAITQ_INITIALIZER_WITH_COUNT(name, count)
-
-#define WAITQ_INITIALIZE(name) \
-        waitq_t name = WAITQ_INITIALIZER(name)
+typedef enum {
+        WAKEUP_FIRST = 0,
+        WAKEUP_ALL
+} wakeup_mode_t;
 
 /** Wait queue structure.
@@ -66 +57 @@
 
         /**
-         * If negative, number of wakeups that are to be ignored (necessary for futex operation).
-         * If positive, number of wakeups that weren't able to wake a thread.
+         * Number of waitq_wakeup() calls that didn't find a thread to wake up.
+         *
          */
-        int wakeup_balance;
+        int missed_wakeups;
+
+        /** Number of wakeups that need to be ignored due to futex timeout. */
+        int ignore_wakeups;
 
         /** List of sleeping threads for which there was no missed_wakeup. */
         list_t sleepers;
-
-        bool closed;
 } waitq_t;
 
-typedef struct wait_guard {
-        ipl_t ipl;
-} wait_guard_t;
+#define waitq_sleep(wq) \
+        waitq_sleep_timeout((wq), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE, NULL)
 
 struct thread;
 
 extern void waitq_initialize(waitq_t *);
-extern void waitq_initialize_with_count(waitq_t *, int);
-extern errno_t waitq_sleep(waitq_t *);
-extern errno_t _waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int);
-extern errno_t waitq_sleep_timeout(waitq_t *, uint32_t);
-extern wait_guard_t waitq_sleep_prepare(waitq_t *);
-extern errno_t waitq_sleep_unsafe(waitq_t *, wait_guard_t);
-extern errno_t waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, wait_guard_t);
-
-extern void waitq_wake_one(waitq_t *);
-extern void waitq_wake_all(waitq_t *);
-extern void waitq_signal(waitq_t *);
-extern void waitq_close(waitq_t *);
+extern errno_t waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
+extern ipl_t waitq_sleep_prepare(waitq_t *);
+extern errno_t waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, bool *);
+extern void waitq_sleep_finish(waitq_t *, bool, ipl_t);
+extern void waitq_wakeup(waitq_t *, wakeup_mode_t);
+extern void _waitq_wakeup_unsafe(waitq_t *, wakeup_mode_t);
+extern void waitq_interrupt_sleep(struct thread *);
+extern int waitq_count_get(waitq_t *);
+extern void waitq_count_set(waitq_t *, int val);
 
 #endif