Changeset 927a181e in mainline for uspace/lib/c/generic/futex.c

Timestamp:

2012-12-04T02:17:04Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

cb10bc9

Parents:

21b703f

Message:

Turned futex_t in uspace into an opaque type.

File:

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

uspace/lib/c/generic/futex.c

@@ -46 +46 @@
 void futex_initialize(futex_t *futex, int val)
 {
-        atomic_set(futex, val);
+        atomic_set(&futex->val, val);
 }
 
@@ -59 +59 @@
 int futex_trydown(futex_t *futex)
 {
-        return cas(futex, 1, 0);
+        return cas(&futex->val, 1, 0);
 }
 
@@ -73 +73 @@
 int futex_down(futex_t *futex)
 {
-        if ((atomic_signed_t) atomic_predec(futex) < 0)
-                return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count);
+        if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
+                return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->val.count);
         
         return 0;
@@ -89 +89 @@
 int futex_up(futex_t *futex)
 {
-        if ((atomic_signed_t) atomic_postinc(futex) < 0)
-                return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->count);
+        if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)
+                return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->val.count);
         
         return 0;