Changes in kernel/generic/src/synch/condvar.c [497bd656:b7fd2a0] in mainline

File:

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

kernel/generic/src/synch/condvar.c

@@ -80 +80 @@
  * 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, ESYNCH_WOULD_BLOCK is always
+ * SYNCH_FLAGS_NON_BLOCKING is specified here, EAGAIN is always
  * returned.
  *
  * @return              See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
+errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
+        bool blocked;
 
         ipl = waitq_sleep_prepare(&cv->wq);
@@ -95 +96 @@
 
         cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags);
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
+        assert(blocked || rc != EOK);
 
-        waitq_sleep_finish(&cv->wq, rc, ipl);
+        waitq_sleep_finish(&cv->wq, blocked, ipl);
         /* Lock only after releasing the waitq to avoid a possible deadlock. */
         mutex_lock(mtx);
@@ -117 +119 @@
  * 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, ESYNCH_WOULD_BLOCK is always
+ * SYNCH_FLAGS_NON_BLOCKING is specified here, EAGAIN is always
  * returned.
  *
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
+errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         ipl_t ipl;
-        
+        bool blocked;
+
         ipl = waitq_sleep_prepare(&cv->wq);
 
@@ -134 +137 @@
 
         cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags);
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
+        assert(blocked || rc != EOK);
 
-        waitq_sleep_finish(&cv->wq, rc, ipl);
+        waitq_sleep_finish(&cv->wq, blocked, ipl);
         /* Lock only after releasing the waitq to avoid a possible deadlock. */
         spinlock_lock(lock);
@@ -152 +156 @@
  * 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, ESYNCH_WOULD_BLOCK is always
+ * SYNCH_FLAGS_NON_BLOCKING is specified here, EAGAIN is always
  * returned.
  *
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
+errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *irq_lock, 
         uint32_t usec, int flags)
 {
-        int rc;
+        errno_t rc;
         /* Save spinlock's state so we can restore it correctly later on. */
         ipl_t ipl = irq_lock->ipl;