Changeset 508b0df1 in mainline for uspace/app

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

Location:

uspace/app

Files:

• rcutest/rcutest.c (modified) (9 diffs)
• tester/float/float1.c (modified) (5 diffs)
• tester/thread/thread1.c (modified) (5 diffs)
• wavplay/main.c (modified) (6 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,
         };

uspace/app/tester/float/float1.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <atomic.h>
+#include <stdatomic.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -45 +45 @@
 
 static FIBRIL_SEMAPHORE_INITIALIZE(threads_finished, 0);
-static atomic_t threads_fault;
+static atomic_int threads_fault;
 
 static errno_t e(void *data)
@@ -60 +60 @@
 
                 if ((uint32_t) (e * PRECISION) != E_10E8) {
-                        atomic_inc(&threads_fault);
+                        atomic_fetch_add(&threads_fault, 1);
                         break;
                 }
@@ -71 +71 @@
 const char *test_float1(void)
 {
-        atomic_count_t total = 0;
+        int total = 0;
 
-        atomic_set(&threads_fault, 0);
+        atomic_store(&threads_fault, 0);
         fibril_test_spawn_runners(THREADS);
 
@@ -92 +92 @@
         TPRINTF("\n");
 
-        for (unsigned int i = 0; i < total; i++) {
-                TPRINTF("Threads left: %" PRIua "\n", total - i);
+        for (int i = 0; i < total; i++) {
+                TPRINTF("Threads left: %d\n", total - i);
                 fibril_semaphore_down(&threads_finished);
         }
 
-        if (atomic_get(&threads_fault) == 0)
+        if (atomic_load(&threads_fault) == 0)
                 return NULL;
 

uspace/app/tester/thread/thread1.c

@@ -31 +31 @@
 #define DELAY    10
 
-#include <atomic.h>
+#include <stdatomic.h>
 #include <errno.h>
 #include <fibril.h>
@@ -40 +40 @@
 #include "../tester.h"
 
-static atomic_t finish;
+static atomic_bool finish;
 
 static FIBRIL_SEMAPHORE_INITIALIZE(threads_finished, 0);
@@ -48 +48 @@
         fibril_detach(fibril_get_id());
 
-        while (atomic_get(&finish))
+        while (!atomic_load(&finish))
                 fibril_usleep(100000);
 
@@ -57 +57 @@
 const char *test_thread1(void)
 {
-        unsigned int i;
-        atomic_count_t total = 0;
+        int total = 0;
 
-        atomic_set(&finish, 1);
+        atomic_store(&finish, false);
 
         fibril_test_spawn_runners(THREADS);
 
         TPRINTF("Creating threads");
-        for (i = 0; i < THREADS; i++) {
+        for (int i = 0; i < THREADS; i++) {
                 fid_t f = fibril_create(threadtest, NULL);
                 if (!f) {
@@ -80 +79 @@
         TPRINTF("\n");
 
-        atomic_set(&finish, 0);
-        for (i = 0; i < total; i++) {
-                TPRINTF("Threads left: %" PRIua "\n",
-                    total - i);
+        atomic_store(&finish, true);
+        for (int i = 0; i < total; i++) {
+                TPRINTF("Threads left: %d\n", total - i);
                 fibril_semaphore_down(&threads_finished);
         }

uspace/app/wavplay/main.c

@@ -35 +35 @@
 
 #include <assert.h>
-#include <atomic.h>
+#include <stdatomic.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -189 +189 @@
 typedef struct {
         hound_context_t *ctx;
-        atomic_t *count;
+        atomic_int *count;
         const char *file;
 } fib_play_t;
@@ -203 +203 @@
         fib_play_t *p = arg;
         const errno_t ret = hplay_ctx(p->ctx, p->file);
-        atomic_dec(p->count);
+        atomic_fetch_sub(p->count, 1);
         free(arg);
         return ret;
@@ -279 +279 @@
         /* Init parallel playback variables */
         hound_context_t *hound_ctx = NULL;
-        atomic_t playcount;
-        atomic_set(&playcount, 0);
+        atomic_int playcount = 0;
 
         /* Init parallel playback context if necessary */
@@ -332 +331 @@
                                 data->ctx = hound_ctx;
                                 fid_t fid = fibril_create(play_wrapper, data);
-                                atomic_inc(&playcount);
+                                atomic_fetch_add(&playcount, 1);
                                 fibril_add_ready(fid);
                         } else {
@@ -341 +340 @@
 
         /* Wait for all fibrils to finish */
-        while (atomic_get(&playcount) > 0)
+        while (atomic_load(&playcount) > 0)
                 fibril_usleep(1000000);