Changes in kernel/generic/src/synch/condvar.c [111b9b9:e88eb48] in mainline

File:

• kernel/generic/src/synch/condvar.c (modified) (4 diffs)

kernel/generic/src/synch/condvar.c

@@ -58 +58 @@
 void condvar_signal(condvar_t *cv)
 {
-        waitq_signal(&cv->wq);
+        waitq_wakeup(&cv->wq, WAKEUP_FIRST);
 }
 
@@ -68 +68 @@
 void condvar_broadcast(condvar_t *cv)
 {
-        waitq_wake_all(&cv->wq);
+        waitq_wakeup(&cv->wq, WAKEUP_ALL);
 }
 
@@ -76 +76 @@
  * @param mtx           Mutex.
  * @param usec          Timeout value in microseconds.
+ * @param flags         Select mode of operation.
+ *
+ * For exact description of meaning of possible combinations of usec and flags,
+ * see comment for waitq_sleep_timeout().  Note that when
+ * SYNCH_FLAGS_NON_BLOCKING is specified here, EAGAIN is always
+ * returned.
  *
  * @return              See comment for waitq_sleep_timeout().
  */
-errno_t condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec)
+errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
-        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
+        errno_t rc;
+        ipl_t ipl;
+        bool blocked;
 
+        ipl = waitq_sleep_prepare(&cv->wq);
         /* Unlock only after the waitq is locked so we don't miss a wakeup. */
         mutex_unlock(mtx);
 
-        errno_t rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, SYNCH_FLAGS_NON_BLOCKING, guard);
+        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
+        assert(blocked || rc != EOK);
 
+        waitq_sleep_finish(&cv->wq, blocked, ipl);
+        /* Lock only after releasing the waitq to avoid a possible deadlock. */
         mutex_lock(mtx);
-        return rc;
-}
 
-errno_t condvar_wait(condvar_t *cv, mutex_t *mtx)
-{
-        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
-
-        /* Unlock only after the waitq is locked so we don't miss a wakeup. */
-        mutex_unlock(mtx);
-
-        errno_t rc = waitq_sleep_unsafe(&cv->wq, guard);
-
-        mutex_lock(mtx);
         return rc;
 }
@@ -126 +127 @@
     uint32_t usec, int flags)
 {
-        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
+        errno_t rc;
+        ipl_t ipl;
+        bool blocked;
+
+        ipl = waitq_sleep_prepare(&cv->wq);
 
         /* Unlock only after the waitq is locked so we don't miss a wakeup. */
         spinlock_unlock(lock);
 
-        errno_t rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, guard);
+        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
+        assert(blocked || rc != EOK);
 
+        waitq_sleep_finish(&cv->wq, blocked, ipl);
+        /* Lock only after releasing the waitq to avoid a possible deadlock. */
         spinlock_lock(lock);
+
         return rc;
 }