Changeset 38e3427 in mainline

Timestamp:

2018-06-25T21:51:37Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

f6372be9

Parents:

95838f1

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 21:03:47)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 21:51:37)

Message:

Switch other up/down to lock/unlock.

File:

• uspace/lib/c/generic/rcu.c (modified) (9 diffs)

uspace/lib/c/generic/rcu.c

@@ -172 +172 @@
         assert(!fibril_rcu.registered);
 
-        futex_down(&rcu.list_futex);
+        futex_lock(&rcu.list_futex);
         list_append(&fibril_rcu.link, &rcu.fibrils_list);
-        futex_up(&rcu.list_futex);
+        futex_unlock(&rcu.list_futex);
 
         fibril_rcu.registered = true;
@@ -197 +197 @@
         fibril_rcu.nesting_cnt = 0;
 
-        futex_down(&rcu.list_futex);
+        futex_lock(&rcu.list_futex);
         list_remove(&fibril_rcu.link);
-        futex_up(&rcu.list_futex);
+        futex_unlock(&rcu.list_futex);
 
         fibril_rcu.registered = false;
@@ -334 +334 @@
 static void wait_for_readers(size_t reader_group)
 {
-        futex_down(&rcu.list_futex);
+        futex_lock(&rcu.list_futex);
 
         list_t quiescent_fibrils;
@@ -345 +345 @@
 
                         if (is_preexisting_reader(fib, reader_group)) {
-                                futex_up(&rcu.list_futex);
+                                futex_unlock(&rcu.list_futex);
                                 sync_sleep();
-                                futex_down(&rcu.list_futex);
+                                futex_lock(&rcu.list_futex);
                                 /* Break to while loop. */
                                 break;
@@ -358 +358 @@
 
         list_concat(&rcu.fibrils_list, &quiescent_fibrils);
-        futex_up(&rcu.list_futex);
+        futex_unlock(&rcu.list_futex);
 }
 
 static void lock_sync(void)
 {
-        futex_down(&rcu.sync_lock.futex);
+        futex_lock(&rcu.sync_lock.futex);
         if (rcu.sync_lock.locked) {
                 blocked_fibril_t blocked_fib;
@@ -372 +372 @@
                 do {
                         blocked_fib.is_ready = false;
-                        futex_up(&rcu.sync_lock.futex);
+                        futex_unlock(&rcu.sync_lock.futex);
                         fibril_switch(FIBRIL_TO_MANAGER);
-                        futex_down(&rcu.sync_lock.futex);
+                        futex_lock(&rcu.sync_lock.futex);
                 } while (rcu.sync_lock.locked);
 
@@ -394 +394 @@
         if (0 < rcu.sync_lock.blocked_thread_cnt) {
                 --rcu.sync_lock.blocked_thread_cnt;
-                futex_up(&rcu.sync_lock.futex_blocking_threads);
+                futex_unlock(&rcu.sync_lock.futex_blocking_threads);
         } else {
                 /* Unlock but wake up any fibrils waiting for the lock. */
@@ -409 +409 @@
 
                 rcu.sync_lock.locked = false;
-                futex_up(&rcu.sync_lock.futex);
+                futex_unlock(&rcu.sync_lock.futex);
         }
 }
@@ -420 +420 @@
          * but keep sync locked.
          */
-        futex_up(&rcu.sync_lock.futex);
+        futex_unlock(&rcu.sync_lock.futex);
         async_usleep(RCU_SLEEP_MS * 1000);
-        futex_down(&rcu.sync_lock.futex);
+        futex_lock(&rcu.sync_lock.futex);
 }