Changeset 508b0df1 in mainline for uspace/app/tester

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/tester

Files:

• float/float1.c (modified) (5 diffs)
• thread/thread1.c (modified) (5 diffs)

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);
         }