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

Timestamp:

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

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/semaphore1.c (modified) (3 diffs)

kernel/test/synch/semaphore1.c

@@ -73 +73 @@
 {
         int i, j, k;
-        atomic_count_t consumers;
-        atomic_count_t producers;
+        size_t consumers;
+        size_t producers;
 
         waitq_initialize(&can_start);
@@ -82 +82 @@
                 thread_t *thrd;
 
-                atomic_set(&items_produced, 0);
-                atomic_set(&items_consumed, 0);
+                atomic_store(&items_produced, 0);
+                atomic_store(&items_consumed, 0);
 
                 consumers = i * CONSUMERS;
                 producers = (4 - i) * PRODUCERS;
 
-                TPRINTF("Creating %" PRIua " consumers and %" PRIua " producers...",
+                TPRINTF("Creating %zu consumers and %zu producers...",
                     consumers, producers);
 
@@ -115 +115 @@
                 waitq_wakeup(&can_start, WAKEUP_ALL);
 
-                while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
-                        TPRINTF("%" PRIua " consumers remaining, %" PRIua " producers remaining\n",
-                            consumers - items_consumed.count, producers - items_produced.count);
+                while ((items_consumed != consumers) || (items_produced != producers)) {
+                        TPRINTF("%zu consumers remaining, %zu producers remaining\n",
+                            consumers - items_consumed, producers - items_produced);
                         thread_sleep(1);
                 }