Changeset 132ab5d1 in mainline for kernel/generic/src/synch/condvar.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/synch/condvar.c (modified) (7 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.
  *
@@ -89 +89 @@
         int 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.
  *
@@ -127 +129 @@
         int 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.
  *