Changes in kernel/generic/src/synch/condvar.c [e88eb48:0b47781] in mainline

File:

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

kernel/generic/src/synch/condvar.c

@@ -48 +48 @@
 void condvar_initialize(condvar_t *cv)
 {
-        waitq_initialize(&cv->wq);
+        *cv = CONDVAR_INITIALIZER(*cv);
 }
 
@@ -58 +58 @@
 void condvar_signal(condvar_t *cv)
 {
-        waitq_wakeup(&cv->wq, WAKEUP_FIRST);
+        waitq_signal(&cv->wq);
 }
 
@@ -68 +68 @@
 void condvar_broadcast(condvar_t *cv)
 {
-        waitq_wakeup(&cv->wq, WAKEUP_ALL);
+        waitq_wake_all(&cv->wq);
 }
 
@@ -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, int flags)
+errno_t __condvar_wait_timeout_mutex(condvar_t *cv, mutex_t *mtx, uint32_t usec)
 {
-        errno_t rc;
-        ipl_t ipl;
-        bool blocked;
+        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
 
-        ipl = waitq_sleep_prepare(&cv->wq);
         /* Unlock only after the waitq is locked so we don't miss a wakeup. */
         mutex_unlock(mtx);
 
-        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
-        assert(blocked || rc != EOK);
+        errno_t rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, SYNCH_FLAGS_NON_BLOCKING, guard);
 
-        waitq_sleep_finish(&cv->wq, blocked, ipl);
-        /* Lock only after releasing the waitq to avoid a possible deadlock. */
         mutex_lock(mtx);
-
         return rc;
 }
 
-/** Wait for the condition to become true with a locked spinlock.
- *
- * The function is not aware of irq_spinlock. Therefore do not even
- * try passing irq_spinlock_t to it. Use _condvar_wait_timeout_irq_spinlock()
- * instead.
- *
- * @param cv            Condition variable.
- * @param lock          Locked spinlock.
- * @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_spinlock_impl(condvar_t *cv, spinlock_t *lock,
-    uint32_t usec, int flags)
+errno_t __condvar_wait_mutex(condvar_t *cv, mutex_t *mtx)
 {
-        errno_t rc;
-        ipl_t ipl;
-        bool blocked;
+        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
 
-        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_unsafe(&cv->wq, guard);
+
+        mutex_lock(mtx);
+        return rc;
+}
+
+/** Same as __condvar_wait_timeout_mutex(), except for spinlock_t. */
+errno_t __condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock,
+    uint32_t usec)
+{
+        wait_guard_t guard = waitq_sleep_prepare(&cv->wq);
 
         /* Unlock only after the waitq is locked so we don't miss a wakeup. */
         spinlock_unlock(lock);
 
-        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
-        assert(blocked || rc != EOK);
+        errno_t rc = waitq_sleep_timeout_unsafe(&cv->wq, usec,
+            SYNCH_FLAGS_NON_BLOCKING, guard);
 
-        waitq_sleep_finish(&cv->wq, blocked, ipl);
-        /* Lock only after releasing the waitq to avoid a possible deadlock. */
         spinlock_lock(lock);
-
         return rc;
 }
 
-/** Wait for the condition to become true with a locked irq spinlock.
- *
- * @param cv            Condition variable.
- * @param lock          Locked irq spinlock.
- * @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_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock,
-    uint32_t usec, int flags)
+errno_t __condvar_wait_spinlock(condvar_t *cv, spinlock_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. */
+        spinlock_unlock(mtx);
+
+        errno_t rc = waitq_sleep_unsafe(&cv->wq, guard);
+
+        spinlock_lock(mtx);
+        return rc;
+}
+
+/** Same as __condvar_wait_timeout_mutex(), except for irq_spinlock_t. */
+errno_t __condvar_wait_timeout_irq_spinlock(condvar_t *cv,
+    irq_spinlock_t *irq_lock, uint32_t usec)
 {
         errno_t rc;
@@ -181 +155 @@
          * running) and there is no danger of a deadlock.
          */
-        rc = _condvar_wait_timeout_spinlock(cv, &irq_lock->lock, usec, flags);
+        rc = __condvar_wait_timeout_spinlock(cv, &irq_lock->lock, usec);
+
+        irq_lock->guard = guard;
+        irq_lock->ipl = ipl;
+
+        return rc;
+}
+
+/** Same as __condvar_wait_mutex(), except for irq_spinlock_t. */
+errno_t __condvar_wait_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock)
+{
+        errno_t rc;
+        /* Save spinlock's state so we can restore it correctly later on. */
+        ipl_t ipl = irq_lock->ipl;
+        bool guard = irq_lock->guard;
+
+        irq_lock->guard = false;
+
+        rc = __condvar_wait_spinlock(cv, &irq_lock->lock);
 
         irq_lock->guard = guard;