Changeset 76e17d7c in mainline for kernel/generic/src/synch/semaphore.c

Timestamp:

2023-02-11T18:50:54Z (2 years ago)

Author:

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

Branches:

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

Children:

111b9b9

Parents:

11d2c983

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-05 15:30:26)

git-committer:

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

Message:

Reorganize mutex implementation

File:

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

kernel/generic/src/synch/semaphore.c

@@ -55 +55 @@
 }
 
-errno_t _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned flags)
-{
-        errno_t rc = waitq_sleep_timeout(&sem->wq, usec, flags, NULL);
-        assert(rc == EOK || rc == ETIMEOUT || rc == EAGAIN);
-        return rc;
-}
-
 errno_t semaphore_trydown(semaphore_t *sem)
 {
-        return _semaphore_down_timeout(sem, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
+        return semaphore_down_timeout(sem, 0);
 }
 
@@ -77 +70 @@
 errno_t semaphore_down_timeout(semaphore_t *sem, uint32_t usec)
 {
-        return _semaphore_down_timeout(sem, usec, SYNCH_FLAGS_NON_BLOCKING);
+        errno_t rc = waitq_sleep_timeout(&sem->wq, usec, SYNCH_FLAGS_NON_BLOCKING, NULL);
+        assert(rc == EOK || rc == ETIMEOUT || rc == EAGAIN);
+        return rc;
 }