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

Timestamp:

2018-09-06T20:21:52Z (6 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/lib/c/generic/thread/futex.c (modified) (8 diffs)

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