Changeset 5110d0a in mainline for kernel/generic/src/synch/condvar.c

Timestamp:

2023-02-07T16:02:50Z (15 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c5320c

Parents:

8a55346

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-06 16:44:26)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-07 16:02:50)

Message:

Turn a bunch of macros into regular functions

File:

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

kernel/generic/src/synch/condvar.c

@@ -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(condvar_t *cv, mutex_t *mtx, uint32_t usec)
 {
         errno_t rc;
@@ -96 +90 @@
 
         cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, flags, &blocked);
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, SYNCH_FLAGS_NON_BLOCKING, &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)
+{
+        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);
+
+        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
+        rc = waitq_sleep_unsafe(&cv->wq, &blocked);
         assert(blocked || rc != EOK);