Changeset 32d2e60 in mainline

Timestamp:

2012-12-04T15:54:40Z (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:

b7acf38

Parents:

d54b303

Message:

Compilation fixes of upgradable futexes.

Location:

uspace

Files:

• app/rcubench/rcubench.c (modified) (3 diffs)
• lib/c/generic/futex.c (modified) (3 diffs)
• lib/c/include/futex.h (modified) (2 diffs)
• lib/urcu/rcu.c (modified) (1 diff)

uspace/app/rcubench/rcubench.c

@@ -79 +79 @@
 }
 
+
 static void  kernel_futex_bench(bench_t *bench)
 {
@@ -136 +137 @@
         
         /* Signal another thread completed. */
-        futex_up(&bench->done_threads);
+        _futex_up(&bench->done_threads);
 }
 
@@ -170 +171 @@
         /* Wait for threads to complete. */
         for (size_t k = 0; k < bench->nthreads; ++k) {
-                futex_down(&bench->done_threads);
+                _futex_down(&bench->done_threads);
         }
 }

uspace/lib/c/generic/futex.c

@@ -36 +36 @@
 #include <atomic.h>
 
+
 /** Initialize futex counter.
  *
@@ -50 +51 @@
 #ifdef FUTEX_UPGRADABLE
 
-int _upgrade_futex = 0;
+int _upgrade_futexes = 0;
 static futex_t upg_and_wait_futex = FUTEX_INITIALIZER;
 
@@ -57 +58 @@
         _futex_down(&upg_and_wait_futex);
         
-        if (!_upgrade_futex) {
-                rcu_assign(_upgrade_futex, 1);
-                rcu_synchronize();
+        if (!_upgrade_futexes) {
+                rcu_assign(_upgrade_futexes, 1);
+                _rcu_synchronize(BM_BLOCK_THREAD);
         }
         

uspace/lib/c/include/futex.h

@@ -53 +53 @@
 #include <rcu.h>
 
-#define FUTEX_INITIALIZE(val) {{(val)}, {0}}
+#define FUTEX_INITIALIZE(val) {{ (val) }, 0}
 
 #define futex_down(fut) \
@@ -94 +94 @@
 #else
 
-#define FUTEX_INITIALIZE(val) {{(val)}}
+#define FUTEX_INITIALIZE(val) {{ (val) }}
 
 #define futex_down(fut)     (void)_futex_down((fut))

uspace/lib/urcu/rcu.c

@@ -223 +223 @@
 {
         assert(fibril_rcu.registered);
+        /* assert(rcu_read_locked()); */
         
         /* Required by MB_FORCE_U */