Changeset 927a181e in mainline

Timestamp:

2012-12-04T02:17:04Z (11 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.

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (1 diff)
• generic/fibril.c (modified) (2 diffs)
• generic/futex.c (modified) (4 diffs)
• generic/ipc.c (modified) (1 diff)
• include/futex.h (modified) (1 diff)
• include/ipc/common.h (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -166 +166 @@
 
 /** Async framework global futex */
-atomic_t async_futex = FUTEX_INITIALIZER;
+futex_t async_futex = FUTEX_INITIALIZER;
 
 /** Number of threads waiting for IPC in the kernel. */

uspace/lib/c/generic/fibril.c

@@ -49 +49 @@
 #include <assert.h>
 #include <async.h>
+#include <futex.h>
 
 /**
@@ -54 +55 @@
  * serialized_list and manager_list.
  */
-static atomic_t fibril_futex = FUTEX_INITIALIZER;
+static futex_t fibril_futex = FUTEX_INITIALIZER;
 
 static LIST_INITIALIZE(ready_list);

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;

uspace/lib/c/generic/ipc.c

@@ -81 +81 @@
 LIST_INITIALIZE(queued_calls);
 
-static atomic_t ipc_futex = FUTEX_INITIALIZER;
+static futex_t ipc_futex = FUTEX_INITIALIZER;
 
 /** Send asynchronous message via syscall.

uspace/lib/c/include/futex.h

@@ -39 +39 @@
 #include <sys/types.h>
 
-#define FUTEX_INITIALIZER  {1}
+#define FUTEX_INITIALIZER  {{1}}
 
-typedef atomic_t futex_t;
+typedef struct futex {
+        atomic_t val;
+} futex_t;
 
 extern void futex_initialize(futex_t *futex, int value);

uspace/lib/c/include/ipc/common.h

@@ -40 +40 @@
 #include <atomic.h>
 #include <task.h>
+#include <futex.h>
 
 #define IPC_FLAG_BLOCKING  0x01
@@ -51 +52 @@
 typedef sysarg_t ipc_callid_t;
 
-extern atomic_t async_futex;
+extern futex_t async_futex;
 
 #endif