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

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