Changeset 8565a42 in mainline for uspace/lib/c/generic/rcu.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

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

uspace/lib/c/generic/rcu.c

@@ -169 +169 @@
 {
         assert(!fibril_rcu.registered);
-        
+
         futex_down(&rcu.list_futex);
         list_append(&fibril_rcu.link, &rcu.fibrils_list);
         futex_up(&rcu.list_futex);
-        
+
         fibril_rcu.registered = true;
 }
@@ -185 +185 @@
 {
         assert(fibril_rcu.registered);
-        
+
         /*
          * Forcefully unlock any reader sections. The fibril is exiting
@@ -194 +194 @@
         memory_barrier();
         fibril_rcu.nesting_cnt = 0;
-        
+
         futex_down(&rcu.list_futex);
         list_remove(&fibril_rcu.link);
@@ -209 +209 @@
 {
         assert(fibril_rcu.registered);
-        
+
         size_t nesting_cnt = ACCESS_ONCE(fibril_rcu.nesting_cnt);
-        
+
         if (0 == (nesting_cnt >> RCU_NESTING_SHIFT)) {
                 ACCESS_ONCE(fibril_rcu.nesting_cnt) = ACCESS_ONCE(rcu.reader_group);
@@ -226 +226 @@
         assert(fibril_rcu.registered);
         assert(rcu_read_locked());
-        
+
         /* Required by MB_FORCE_U */
         compiler_barrier(); /* CC_BAR_U */
@@ -243 +243 @@
 {
         assert(!rcu_read_locked());
-        
+
         /* Contain load of rcu.cur_gp. */
         memory_barrier();
@@ -249 +249 @@
         /* Approximately the number of the GP in progress. */
         size_t gp_in_progress = ACCESS_ONCE(rcu.cur_gp);
-        
+
         lock_sync(blocking_mode);
-        
+
         /*
          * Exit early if we were stuck waiting for the mutex for a full grace
@@ -264 +264 @@
                 return;
         }
-        
+
         ++ACCESS_ONCE(rcu.cur_gp);
-        
+
         /*
          * Pairs up with MB_FORCE_L (ie CC_BAR_L). Makes changes prior
@@ -272 +272 @@
          */
         memory_barrier(); /* MB_A */
-        
+
         /*
          * Pairs up with MB_A.
@@ -290 +290 @@
          */
         force_mb_in_all_threads(); /* MB_FORCE_L */
-        
+
         /*
          * Pairs with MB_FORCE_L (ie CC_BAR_L, CC_BAR_U) and makes the most
@@ -296 +296 @@
          */
         read_barrier(); /* MB_B */
-        
+
         size_t new_reader_group = get_other_group(rcu.reader_group);
         wait_for_readers(new_reader_group, blocking_mode);
-        
+
         /* Separates waiting for readers in new_reader_group from group flip. */
         memory_barrier();
-        
+
         /* Flip the group new readers should associate with. */
         size_t old_reader_group = rcu.reader_group;
@@ -309 +309 @@
         /* Flip the group before waiting for preexisting readers in the old group.*/
         memory_barrier();
-        
+
         wait_for_readers(old_reader_group, blocking_mode);
-        
+
         /* MB_FORCE_U  */
         force_mb_in_all_threads(); /* MB_FORCE_U */
-        
+
         unlock_sync();
 }
@@ -333 +333 @@
 {
         futex_down(&rcu.list_futex);
-        
+
         list_t quiescent_fibrils;
         list_initialize(&quiescent_fibrils);
-        
+
         while (!list_empty(&rcu.fibrils_list)) {
                 list_foreach_safe(rcu.fibrils_list, fibril_it, next_fibril) {
                         fibril_rcu_data_t *fib = member_to_inst(fibril_it,
                                 fibril_rcu_data_t, link);
-                        
+
                         if (is_preexisting_reader(fib, reader_group)) {
                                 futex_up(&rcu.list_futex);
@@ -354 +354 @@
                 }
         }
-        
+
         list_concat(&rcu.fibrils_list, &quiescent_fibrils);
         futex_up(&rcu.list_futex);
@@ -366 +366 @@
                         blocked_fibril_t blocked_fib;
                         blocked_fib.id = fibril_get_id();
-                                
+
                         list_append(&blocked_fib.link, &rcu.sync_lock.blocked_fibrils);
-                        
+
                         do {
                                 blocked_fib.is_ready = false;
@@ -375 +375 @@
                                 futex_down(&rcu.sync_lock.futex);
                         } while (rcu.sync_lock.locked);
-                        
+
                         list_remove(&blocked_fib.link);
                         rcu.sync_lock.locked = true;
@@ -392 +392 @@
 {
         assert(rcu.sync_lock.locked);
-        
+
         /*
          * Blocked threads have a priority over fibrils when accessing sync().
@@ -402 +402 @@
         } else {
                 /* Unlock but wake up any fibrils waiting for the lock. */
-                
+
                 if (!list_empty(&rcu.sync_lock.blocked_fibrils)) {
                         blocked_fibril_t *blocked_fib = member_to_inst(
                                 list_first(&rcu.sync_lock.blocked_fibrils), blocked_fibril_t, link);
-        
+
                         if (!blocked_fib->is_ready) {
                                 blocked_fib->is_ready = true;
@@ -412 +412 @@
                         }
                 }
-                
+
                 rcu.sync_lock.locked = false;
                 futex_up(&rcu.sync_lock.futex);
@@ -432 +432 @@
                 thread_usleep(RCU_SLEEP_MS * 1000);
         }
-                
+
         futex_down(&rcu.sync_lock.futex);
 }
@@ -440 +440 @@
 {
         size_t nesting_cnt = ACCESS_ONCE(fib->nesting_cnt);
-        
+
         return is_in_group(nesting_cnt, group) && is_in_reader_section(nesting_cnt);
 }