Changeset 156b6406 in mainline for uspace/lib/urcu/rcu.c

Timestamp:

2012-12-04T16:42:06Z (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:

b188002

Parents:

b7acf38

Message:

Differentiated futexes when used with mutex semantics from those with semaphore semantics.

File:

• uspace/lib/urcu/rcu.c (modified) (11 diffs)

uspace/lib/urcu/rcu.c

@@ -168 +168 @@
         assert(!fibril_rcu.registered);
         
-        _futex_down(&rcu.list_futex);
+        futex_down(&rcu.list_futex);
         list_append(&fibril_rcu.link, &rcu.fibrils_list);
-        _futex_up(&rcu.list_futex);
+        futex_up(&rcu.list_futex);
         
         fibril_rcu.registered = true;
@@ -193 +193 @@
         fibril_rcu.nesting_cnt = 0;
         
-        _futex_down(&rcu.list_futex);
+        futex_down(&rcu.list_futex);
         list_remove(&fibril_rcu.link);
-        _futex_up(&rcu.list_futex);
+        futex_up(&rcu.list_futex);
 
         fibril_rcu.registered = false;
@@ -330 +330 @@
 static void wait_for_readers(size_t reader_group, blocking_mode_t blocking_mode)
 {
-        _futex_down(&rcu.list_futex);
+        futex_down(&rcu.list_futex);
         
         list_t quiescent_fibrils;
@@ -341 +341 @@
                         
                         if (is_preexisting_reader(fib, reader_group)) {
-                                _futex_up(&rcu.list_futex);
+                                futex_up(&rcu.list_futex);
                                 sync_sleep(blocking_mode);
-                                _futex_down(&rcu.list_futex);
+                                futex_down(&rcu.list_futex);
                                 /* Break to while loop. */
                                 break;
@@ -354 +354 @@
         
         list_concat(&rcu.fibrils_list, &quiescent_fibrils);
-        _futex_up(&rcu.list_futex);
+        futex_up(&rcu.list_futex);
 }
 
 static void lock_sync(blocking_mode_t blocking_mode)
 {
-        _futex_down(&rcu.sync_lock.futex);
+        futex_down(&rcu.sync_lock.futex);
         if (rcu.sync_lock.locked) {
                 if (blocking_mode == BM_BLOCK_FIBRIL) {
@@ -369 +369 @@
                         do {
                                 blocked_fib.is_ready = false;
-                                _futex_up(&rcu.sync_lock.futex);
+                                futex_up(&rcu.sync_lock.futex);
                                 fibril_switch(FIBRIL_TO_MANAGER);
-                                _futex_down(&rcu.sync_lock.futex);
+                                futex_down(&rcu.sync_lock.futex);
                         } while (rcu.sync_lock.locked);
                         
@@ -379 +379 @@
                         assert(blocking_mode == BM_BLOCK_THREAD);
                         rcu.sync_lock.blocked_thread_cnt++;
-                        _futex_up(&rcu.sync_lock.futex);
-                        _futex_down(&rcu.sync_lock.futex_blocking_threads);
+                        futex_up(&rcu.sync_lock.futex);
+                        futex_down(&rcu.sync_lock.futex_blocking_threads);
                 }
         } else {
@@ -397 +397 @@
         if (0 < rcu.sync_lock.blocked_thread_cnt) {
                 --rcu.sync_lock.blocked_thread_cnt;
-                _futex_up(&rcu.sync_lock.futex_blocking_threads);
+                futex_up(&rcu.sync_lock.futex_blocking_threads);
         } else {
                 /* Unlock but wake up any fibrils waiting for the lock. */
@@ -412 +412 @@
                 
                 rcu.sync_lock.locked = false;
-                _futex_up(&rcu.sync_lock.futex);
+                futex_up(&rcu.sync_lock.futex);
         }
 }
@@ -423 +423 @@
          * but keep sync locked. 
          */
-        _futex_up(&rcu.sync_lock.futex);
+        futex_up(&rcu.sync_lock.futex);
 
         if (blocking_mode == BM_BLOCK_FIBRIL) {
@@ -431 +431 @@
         }
                 
-        _futex_down(&rcu.sync_lock.futex);
+        futex_down(&rcu.sync_lock.futex);
 }