Changeset 132ab5d1 in mainline for uspace/lib/c/include/futex.h

Timestamp:

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

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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:

• uspace/lib/c/include/futex.h (modified) (6 diffs)

uspace/lib/c/include/futex.h

@@ -37 +37 @@
 
 #include <atomic.h>
+#include <errno.h>
 #include <libc.h>
 
@@ -107 +108 @@
  * @param futex Futex.
  *
- * @return Non-zero if the futex was acquired.
- * @return Zero if the futex was not acquired.
+ * @return true if the futex was acquired.
+ * @return false if the futex was not acquired.
  *
  */
-static inline int futex_trydown(futex_t *futex)
+static inline bool futex_trydown(futex_t *futex)
 {
         return cas(&futex->val, 1, 0);
@@ -121 +122 @@
  *
  * @return ENOENT if there is no such virtual address.
- * @return Zero in the uncontended case.
- * @return Otherwise one of ESYNCH_OK_ATOMIC or ESYNCH_OK_BLOCKED.
+ * @return EOK on success.
+ * @return Error code from <errno.h> otherwise.
  *
  */
@@ -128 +129 @@
 {
         if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
-                return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
+                return (int) __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
         
-        return 0;
+        return EOK;
 }
 
@@ -138 +139 @@
  *
  * @return ENOENT if there is no such virtual address.
- * @return Zero in the uncontended case.
+ * @return EOK on success.
+ * @return Error code from <errno.h> otherwise.
  *
  */
@@ -144 +146 @@
 {
         if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)
-                return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
+                return (int) __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
         
-        return 0;
+        return EOK;
 }