Changes in kernel/generic/include/atomic.h [4621d23:c53e813] in mainline

File:

• kernel/generic/include/atomic.h (modified) (1 diff)

kernel/generic/include/atomic.h

@@ -40 +40 @@
 #include <stdatomic.h>
 
-typedef size_t atomic_count_t;
-typedef ssize_t atomic_signed_t;
+// TODO: Remove.
+// Before <stdatomic.h> was available, there was only one atomic type
+// equivalent to atomic_size_t. This means that in some places, atomic_t can
+// be replaced with a more appropriate type (e.g. atomic_bool for flags or
+// a signed type for potentially signed values).
+// So atomic_t should be replaced with the most appropriate type on a case by
+// case basis, and after there are no more uses, remove this type.
+typedef atomic_size_t atomic_t;
 
-#define PRIua  "zu"          /**< Format for atomic_count_t. */
+#define atomic_predec(val) \
+        (atomic_fetch_sub((val), 1) - 1)
 
-typedef struct {
-        volatile atomic_size_t count;
-} atomic_t;
+#define atomic_preinc(val) \
+        (atomic_fetch_add((val), 1) + 1)
 
-static inline void atomic_set(atomic_t *val, atomic_count_t i)
-{
-        atomic_store(&val->count, i);
-}
+#define atomic_postdec(val) \
+        atomic_fetch_sub((val), 1)
 
-static inline atomic_count_t atomic_get(atomic_t *val)
-{
-        return atomic_load(&val->count);
-}
+#define atomic_postinc(val) \
+        atomic_fetch_add((val), 1)
 
-static inline size_t atomic_predec(atomic_t *val)
-{
-        return atomic_fetch_sub(&val->count, 1) - 1;
-}
+#define atomic_dec(val) \
+        ((void) atomic_fetch_sub(val, 1))
 
-static inline size_t atomic_preinc(atomic_t *val)
-{
-        return atomic_fetch_add(&val->count, 1) + 1;
-}
-
-static inline size_t atomic_postdec(atomic_t *val)
-{
-        return atomic_fetch_sub(&val->count, 1);
-}
-
-static inline size_t atomic_postinc(atomic_t *val)
-{
-        return atomic_fetch_add(&val->count, 1);
-}
-
-static inline void atomic_dec(atomic_t *val)
-{
-        atomic_fetch_sub(&val->count, 1);
-}
-
-static inline void atomic_inc(atomic_t *val)
-{
-        atomic_fetch_add(&val->count, 1);
-}
+#define atomic_inc(val) \
+        ((void) atomic_fetch_add(val, 1))
 
 #define local_atomic_exchange(var_addr, new_val) \
         atomic_exchange_explicit(var_addr, new_val, memory_order_relaxed)
-
-static inline bool test_and_set(atomic_t *val)
-{
-        return atomic_exchange(&val->count, 1);
-}
-
 
 #endif