Changeset 99c2c69e in mainline for uspace/lib/c/generic/futex.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

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>
@@ -59 +60 @@
 int futex_trydown(futex_t *futex)
 {
-        return cas(futex, 1, 0);
+        int rc;
+
+        rc = cas(futex, 1, 0);
+        CS_ENTER_BARRIER();
+
+        return rc;
 }
 
@@ -73 +79 @@
 int futex_down(futex_t *futex)
 {
-        if ((atomic_signed_t) atomic_predec(futex) < 0)
+        atomic_signed_t nv;
+
+        nv = (atomic_signed_t) atomic_predec(futex);
+        CS_ENTER_BARRIER();
+        if (nv < 0)
                 return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count);
         
@@ -89 +99 @@
 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);