Changeset 6e569bf in mainline for uspace/lib/c/generic/futex.c

Timestamp:

2018-06-26T18:11:24Z (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:

70fae4e

Parents:

8119363

Message:

Fix accidentally introduced build issue.

File:

• uspace/lib/c/generic/futex.c (modified) (2 diffs)

uspace/lib/c/generic/futex.c

@@ -80 +80 @@
 void __futex_lock(futex_t *futex, const char *name)
 {
-        /* We use relaxed atomics to avoid violating C11 memory model.
+        /*
+         * We use relaxed atomics to avoid violating C11 memory model.
          * They should compile to regular load/stores, but simple assignments
          * would be UB by definition.
@@ -90 +91 @@
         futex_down(futex);
 
-        void *prev_owner = __atomic_exchange_n(&futex->owner, self, __ATOMIC_RELAXED);
+        void *prev_owner = __atomic_load_n(&futex->owner, __ATOMIC_RELAXED);
         assert(prev_owner == NULL);
+        __atomic_store_n(&futex->owner, self, __ATOMIC_RELAXED);
 
         atomic_inc(&self->futex_locks);