Changeset 508b0df1 in mainline for uspace/lib/c/generic/thread

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/lib/c/generic/thread

Files:

• fibril.c (modified) (7 diffs)
• futex.c (modified) (8 diffs)

uspace/lib/c/generic/thread/fibril.c

@@ -88 +88 @@
 /* This futex serializes access to global data. */
 static futex_t fibril_futex = FUTEX_INITIALIZER;
-static futex_t ready_semaphore = FUTEX_INITIALIZE(0);
+static futex_t ready_semaphore;
 static long ready_st_count;
 
@@ -117 +117 @@
 }
 
-static inline long _ready_count(void)
-{
-        /*
-         * The number of available tokens is always equal to the number
-         * of fibrils in the ready list + the number of free IPC buffer
-         * buckets.
-         */
-
-        if (multithreaded)
-                return atomic_get(&ready_semaphore.val);
-
-        _ready_debug_check();
-        return ready_st_count;
-}
-
 static inline void _ready_up(void)
 {
@@ -152 +137 @@
 }
 
-static atomic_t threads_in_ipc_wait = { 0 };
+static atomic_int threads_in_ipc_wait;
 
 /** Function that spans the whole life-cycle of a fibril.
@@ -303 +288 @@
         fibril_t *f = list_pop(&ready_list, fibril_t, link);
         if (!f)
-                atomic_inc(&threads_in_ipc_wait);
+                atomic_fetch_add_explicit(&threads_in_ipc_wait, 1,
+                    memory_order_relaxed);
         if (!locked)
                 futex_unlock(&fibril_futex);
@@ -317 +303 @@
         rc = _ipc_wait(&call, expires);
 
-        atomic_dec(&threads_in_ipc_wait);
+        atomic_fetch_sub_explicit(&threads_in_ipc_wait, 1,
+            memory_order_relaxed);
 
         if (rc != EOK && rc != ENOENT) {
@@ -386 +373 @@
         _ready_up();
 
-        if (atomic_get(&threads_in_ipc_wait)) {
+        if (atomic_load_explicit(&threads_in_ipc_wait, memory_order_relaxed)) {
                 DPRINTF("Poking.\n");
                 /* Wakeup one thread sleeping in SYS_IPC_WAIT. */
@@ -811 +798 @@
         if (!multithreaded) {
                 _ready_debug_check();
-                atomic_set(&ready_semaphore.val, ready_st_count);
+                futex_initialize(&ready_semaphore, ready_st_count);
                 multithreaded = true;
         }

uspace/lib/c/generic/thread/futex.c

@@ -34 +34 @@
 
 #include <assert.h>
-#include <atomic.h>
+#include <stdatomic.h>
 #include <fibril.h>
 #include <io/kio.h>
@@ -52 +52 @@
 void futex_initialize(futex_t *futex, int val)
 {
-        atomic_set(&futex->val, val);
+        atomic_store_explicit(&futex->val, val, memory_order_relaxed);
 }
 
@@ -59 +59 @@
 void __futex_assert_is_locked(futex_t *futex, const char *name)
 {
-        void *owner = __atomic_load_n(&futex->owner, __ATOMIC_RELAXED);
+        void *owner = atomic_load_explicit(&futex->owner, memory_order_relaxed);
         fibril_t *self = (fibril_t *) fibril_get_id();
         if (owner != self) {
@@ -69 +69 @@
 void __futex_assert_is_not_locked(futex_t *futex, const char *name)
 {
-        void *owner = __atomic_load_n(&futex->owner, __ATOMIC_RELAXED);
+        void *owner = atomic_load_explicit(&futex->owner, memory_order_relaxed);
         fibril_t *self = (fibril_t *) fibril_get_id();
         if (owner == self) {
@@ -91 +91 @@
         futex_down(futex);
 
-        void *prev_owner = __atomic_load_n(&futex->owner, __ATOMIC_RELAXED);
+        void *prev_owner = atomic_load_explicit(&futex->owner,
+            memory_order_relaxed);
         assert(prev_owner == NULL);
-        __atomic_store_n(&futex->owner, self, __ATOMIC_RELAXED);
+        atomic_store_explicit(&futex->owner, self, memory_order_relaxed);
 }
 
@@ -101 +102 @@
         DPRINTF("Unlocking futex %s (%p) by fibril %p.\n", name, futex, self);
         __futex_assert_is_locked(futex, name);
-        __atomic_store_n(&futex->owner, NULL, __ATOMIC_RELAXED);
+        atomic_store_explicit(&futex->owner, NULL, memory_order_relaxed);
         futex_up(futex);
 }
@@ -110 +111 @@
         bool success = futex_trydown(futex);
         if (success) {
-                void *owner = __atomic_load_n(&futex->owner, __ATOMIC_RELAXED);
+                void *owner = atomic_load_explicit(&futex->owner,
+                    memory_order_relaxed);
                 assert(owner == NULL);
 
-                __atomic_store_n(&futex->owner, self, __ATOMIC_RELAXED);
+                atomic_store_explicit(&futex->owner, self, memory_order_relaxed);
 
                 DPRINTF("Trylock on futex %s (%p) by fibril %p succeeded.\n", name, futex, self);
@@ -130 +132 @@
 
         __futex_assert_is_locked(futex, name);
-        __atomic_store_n(&futex->owner, new_owner, __ATOMIC_RELAXED);
+        atomic_store_explicit(&futex->owner, new_owner, memory_order_relaxed);
 }