Changeset fc10e1b in mainline for kernel/test/synch/rcu1.c

Timestamp:

2018-09-07T16:34:11Z (6 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:

d2c91ab

Parents:

508b0df1 (diff), e90cfa6 (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.

Message:

Merge branch 'atomic'

Use more of <stdatomic.h> in kernel. Increment/decrement macros kept because
the are handy. atomic_t currently kept because I'm way too lazy to go through
all uses and think about the most appropriate replacement.

File:

• kernel/test/synch/rcu1.c (modified) (9 diffs)

kernel/test/synch/rcu1.c

@@ -238 +238 @@
 
 
-static atomic_t nop_callbacks_cnt = { 0 };
+static atomic_t nop_callbacks_cnt = 0;
 /* Must be even. */
 static const int nop_updater_iters = 10000;
@@ -268 +268 @@
 static bool do_nop_callbacks(void)
 {
-        atomic_set(&nop_callbacks_cnt, 0);
+        atomic_store(&nop_callbacks_cnt, 0);
 
         size_t exp_cnt = nop_updater_iters * get_thread_cnt();
@@ -282 +282 @@
         size_t loop_cnt = 0, max_loops = 15;
 
-        while (exp_cnt != atomic_get(&nop_callbacks_cnt) && loop_cnt < max_loops) {
+        while (exp_cnt != atomic_load(&nop_callbacks_cnt) && loop_cnt < max_loops) {
                 ++loop_cnt;
                 TPRINTF(".");
@@ -361 +361 @@
 typedef struct {
         rcu_item_t rcu;
-        atomic_count_t start_time;
+        size_t start_time;
 } seq_item_t;
 
@@ -367 +367 @@
 static errno_t seq_test_result = EOK;
 
-static atomic_t cur_time = { 1 };
-static atomic_count_t max_upd_done_time = { 0 };
+static atomic_t cur_time = 1;
+static size_t max_upd_done_time = { 0 };
 
 static void seq_cb(rcu_item_t *rcu_item)
@@ -399 +399 @@
                 for (size_t i = 0; i < work->read_cnt; ++i) {
                         rcu_read_lock();
-                        atomic_count_t start_time = atomic_postinc(&cur_time);
+                        size_t start_time = atomic_postinc(&cur_time);
 
                         for (volatile size_t d = 0; d < 10 * i; ++d) {
@@ -448 +448 @@
         seq_test_result = EOK;
         max_upd_done_time = 0;
-        atomic_set(&cur_time, 1);
+        atomic_store(&cur_time, 1);
 
         const size_t iters = 100;
@@ -821 +821 @@
 {
         barrier_t *b = member_to_inst(item, barrier_t, rcu_item);
-        atomic_set(&b->done, 1);
+        atomic_store(&b->done, 1);
 }
 
@@ -835 +835 @@
         }
 
-        atomic_set(&barrier->done, 0);
+        atomic_store(&barrier->done, 0);
 
         rcu_call(&barrier->rcu_item, barrier_callback);
         rcu_barrier();
 
-        if (1 == atomic_get(&barrier->done)) {
+        if (1 == atomic_load(&barrier->done)) {
                 free(barrier);
                 return true;