Changeset 508b0df1 in mainline for uspace/app/rcutest

Timestamp:

2018-09-06T20:21:52Z (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:

78de83de, fc10e1b

Parents:

4621d23

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-13 03:53:39)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-06 20:21:52)

Message:

Remove uspace <atomic.h>, use <stdatomic.h> instead

File:

• uspace/app/rcutest/rcutest.c (modified) (9 diffs)

uspace/app/rcutest/rcutest.c

@@ -35 +35 @@
  */
 
-#include <atomic.h>
+#include <stdatomic.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -618 +618 @@
 
 typedef struct {
-        atomic_t time;
-        atomic_t max_start_time_of_done_sync;
+        atomic_size_t time;
+        atomic_size_t max_start_time_of_done_sync;
 
         size_t total_workers;
@@ -630 +630 @@
         size_t upd_iters;
 
-        atomic_t seed;
+        atomic_size_t seed;
         int failed;
 } seq_test_info_t;
@@ -651 +651 @@
         rcu_register_fibril();
 
-        size_t seed = (size_t) atomic_preinc(&arg->seed);
-        bool first = (seed == 1);
+        size_t seed = atomic_fetch_add(&arg->seed, 1);
+        bool first = (seed == 0);
 
         for (size_t k = 0; k < arg->read_iters; ++k) {
@@ -661 +661 @@
 
                 rcu_read_lock();
-                atomic_count_t start_time = atomic_preinc(&arg->time);
+                size_t start_time = atomic_fetch_add(&arg->time, 1);
 
                 /* Do some work. */
@@ -677 +677 @@
                  * (but did not - since it already announced it completed).
                  */
-                if (start_time <= atomic_get(&arg->max_start_time_of_done_sync)) {
+                if (start_time <= atomic_load(&arg->max_start_time_of_done_sync)) {
                         arg->failed = 1;
                 }
@@ -695 +695 @@
 
         for (size_t k = 0; k < arg->upd_iters; ++k) {
-                atomic_count_t start_time = atomic_get(&arg->time);
+                size_t start_time = atomic_load(&arg->time);
                 rcu_synchronize();
 
                 /* This is prone to a race but if it happens it errs to the safe side.*/
-                if (atomic_get(&arg->max_start_time_of_done_sync) < start_time) {
-                        atomic_set(&arg->max_start_time_of_done_sync, start_time);
+                if (atomic_load(&arg->max_start_time_of_done_sync) < start_time) {
+                        atomic_store(&arg->max_start_time_of_done_sync, start_time);
                 }
         }
@@ -716 +716 @@
 
         seq_test_info_t info = {
-                .time = { 0 },
-                .max_start_time_of_done_sync = { 0 },
+                .time = 0,
+                .max_start_time_of_done_sync = 0,
                 .read_iters = 10 * 1000,
                 .upd_iters = 5 * 1000,
@@ -725 +725 @@
                 .done_cnt_mtx = FIBRIL_MUTEX_INITIALIZER(info.done_cnt_mtx),
                 .done_cnt_changed = FIBRIL_CONDVAR_INITIALIZER(info.done_cnt_changed),
-                .seed = { 0 },
+                .seed = 0,
                 .failed = 0,
         };