Changes in uspace/lib/c/generic/private/futex.h [0b8fad2:42da5ed] in mainline

File:

• uspace/lib/c/generic/private/futex.h (modified) (7 diffs)

uspace/lib/c/generic/private/futex.h

@@ -42 +42 @@
 #include <time.h>
 #include <fibril.h>
-#include <abi/cap.h>
-#include <abi/synch.h>
 
 typedef struct futex {
         volatile atomic_int val;
-        volatile cap_waitq_handle_t whandle;
-
 #ifdef CONFIG_DEBUG_FUTEX
         _Atomic(fibril_t *) owner;
@@ -54 +50 @@
 } futex_t;
 
-extern errno_t futex_initialize(futex_t *futex, int value);
-
-static inline errno_t futex_destroy(futex_t *futex)
-{
-        if (futex->whandle) {
-                errno_t rc;
-                rc = __SYSCALL1(SYS_WAITQ_DESTROY, (sysarg_t) futex->whandle);
-                futex->whandle = CAP_NIL;
-                return rc;
-        }
-        return EOK;
-}
+extern void futex_initialize(futex_t *futex, int value);
 
 #ifdef CONFIG_DEBUG_FUTEX
+
+#define FUTEX_INITIALIZE(val) { (val) , NULL }
+#define FUTEX_INITIALIZER     FUTEX_INITIALIZE(1)
 
 void __futex_assert_is_locked(futex_t *, const char *);
@@ -86 +74 @@
 #else
 
+#define FUTEX_INITIALIZE(val) { (val) }
+#define FUTEX_INITIALIZER     FUTEX_INITIALIZE(1)
+
 #define futex_lock(fut)     (void) futex_down((fut))
 #define futex_trylock(fut)  futex_trydown((fut))
@@ -95 +86 @@
 
 #endif
-
-static inline errno_t futex_allocate_waitq(futex_t *futex)
-{
-        return __SYSCALL1(SYS_WAITQ_CREATE, (sysarg_t) &futex->whandle);
-}
 
 /** Down the futex with timeout, composably.
@@ -121 +107 @@
 {
         // TODO: Add tests for this.
-
-        assert(futex->whandle != CAP_NIL);
 
         if (atomic_fetch_sub_explicit(&futex->val, 1, memory_order_acquire) > 0)
@@ -148 +132 @@
         }
 
-        return __SYSCALL3(SYS_WAITQ_SLEEP, (sysarg_t) futex->whandle,
-            (sysarg_t) timeout, (sysarg_t) SYNCH_FLAGS_FUTEX);
+        return __SYSCALL2(SYS_FUTEX_SLEEP, (sysarg_t) futex, (sysarg_t) timeout);
 }
 
@@ -164 +147 @@
 {
         if (atomic_fetch_add_explicit(&futex->val, 1, memory_order_release) < 0)
-                return __SYSCALL1(SYS_WAITQ_WAKEUP, (sysarg_t) futex->whandle);
+                return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) futex);
 
         return EOK;