Changeset fc10e1b in mainline for kernel/generic/include/synch/spinlock.h

Timestamp:

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

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/generic/include/synch/spinlock.h (modified) (10 diffs)

kernel/generic/include/synch/spinlock.h

@@ -36 +36 @@
 #define KERN_SPINLOCK_H_
 
+#include <assert.h>
+#include <stdatomic.h>
 #include <stdbool.h>
-#include <barrier.h>
-#include <assert.h>
 #include <preemption.h>
-#include <atomic.h>
 #include <arch/asm.h>
 
@@ -46 +45 @@
 
 typedef struct spinlock {
-        atomic_t val;
+        atomic_flag flag;
 
 #ifdef CONFIG_DEBUG_SPINLOCK
@@ -70 +69 @@
         spinlock_t lock_name = { \
                 .name = desc_name, \
-                .val = { 0 } \
+                .flag = ATOMIC_FLAG_INIT \
         }
 
@@ -76 +75 @@
         static spinlock_t lock_name = { \
                 .name = desc_name, \
-                .val = { 0 } \
+                .flag = ATOMIC_FLAG_INIT \
         }
 
@@ -89 +88 @@
 #define SPINLOCK_INITIALIZE_NAME(lock_name, desc_name) \
         spinlock_t lock_name = { \
-                .val = { 0 } \
+                .flag = ATOMIC_FLAG_INIT \
         }
 
 #define SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, desc_name) \
         static spinlock_t lock_name = { \
-                .val = { 0 } \
+                .flag = ATOMIC_FLAG_INIT \
         }
 
@@ -126 +125 @@
 NO_TRACE static inline void spinlock_unlock_nondebug(spinlock_t *lock)
 {
-        /*
-         * Prevent critical section code from bleeding out this way down.
-         */
-        CS_LEAVE_BARRIER();
-
-        atomic_set(&lock->val, 0);
+        atomic_flag_clear_explicit(&lock->flag, memory_order_release);
         preemption_enable();
 }
@@ -215 +209 @@
                 .lock = { \
                         .name = desc_name, \
-                        .val = { 0 } \
+                        .flag = ATOMIC_FLAG_INIT \
                 }, \
                 .guard = false, \
@@ -225 +219 @@
                 .lock = { \
                         .name = desc_name, \
-                        .val = { 0 } \
+                        .flag = ATOMIC_FLAG_INIT \
                 }, \
                 .guard = false, \
@@ -236 +230 @@
         irq_spinlock_t lock_name = { \
                 .lock = { \
-                        .val = { 0 } \
+                        .flag = ATOMIC_FLAG_INIT \
                 }, \
                 .guard = false, \
@@ -245 +239 @@
         static irq_spinlock_t lock_name = { \
                 .lock = { \
-                        .val = { 0 } \
+                        .flag = ATOMIC_FLAG_INIT \
                 }, \
                 .guard = false, \