Changes in uspace/lib/c/generic/futex.c [063a74b9:9d58539] in mainline

File:

• uspace/lib/c/generic/futex.c (modified) (4 diffs)

uspace/lib/c/generic/futex.c

@@ -35 +35 @@
 #include <futex.h>
 #include <atomic.h>
-#include <libarch/barrier.h>
 #include <libc.h>
 #include <sys/types.h>
@@ -60 +59 @@
 int futex_trydown(futex_t *futex)
 {
-        int rc;
-
-        rc = cas(futex, 1, 0);
-        CS_ENTER_BARRIER();
-
-        return rc;
+        return cas(futex, 1, 0);
 }
 
@@ -79 +73 @@
 int futex_down(futex_t *futex)
 {
-        atomic_signed_t nv;
-
-        nv = (atomic_signed_t) atomic_predec(futex);
-        CS_ENTER_BARRIER();
-        if (nv < 0)
+        if ((atomic_signed_t) atomic_predec(futex) < 0)
                 return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count);
         
@@ -99 +89 @@
 int futex_up(futex_t *futex)
 {
-        CS_LEAVE_BARRIER();
-
         if ((atomic_signed_t) atomic_postinc(futex) < 0)
                 return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->count);