Changes in uspace/lib/c/include/futex.h [8d2dd7f2:b7fd2a0] in mainline

File:

• uspace/lib/c/include/futex.h (modified) (4 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.
  *
  */
-static inline int futex_down(futex_t *futex)
+static inline errno_t futex_down(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
-                return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
+                return (errno_t) __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.
  *
  */
-static inline int futex_up(futex_t *futex)
+static inline errno_t futex_up(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)
-                return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
+                return (errno_t) __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
         
-        return 0;
+        return EOK;
 }