include: Centralise atomic helpers in atomics.h

Moves the atomics macros that were defined between eth and ssm_pool to
their own header.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

3 files changed, 43 insertions, 25 deletions

diff --git a/include/ouroboros/atomics.h b/include/ouroboros/atomics.h
new file mode 100644
index 00000000..30361fe2
--- /dev/null
+++ b/include/ouroboros/atomics.h
@@ -0,0 +1,38 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2026
+ *
+ * Atomic helpers
+ *
+ *    Dimitri Staessens <dimitri@ouroboros.rocks>
+ *    Sander Vrijders   <sander@ouroboros.rocks>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., http://www.fsf.org/about/contact/.
+ */
+
+#ifndef OUROBOROS_LIB_ATOMICS_H
+#define OUROBOROS_LIB_ATOMICS_H
+
+#define LOAD_RELAXED(p)         (__atomic_load_n(p, __ATOMIC_RELAXED))
+#define LOAD_ACQUIRE(p)         (__atomic_load_n(p, __ATOMIC_ACQUIRE))
+#define LOAD(p)                 (__atomic_load_n(p, __ATOMIC_SEQ_CST))
+
+#define STORE_RELEASE(p, v)     (__atomic_store_n(p, v, __ATOMIC_RELEASE))
+#define STORE(p, v)             (__atomic_store_n(p, v, __ATOMIC_SEQ_CST))
+
+#define FETCH_ADD_RELAXED(p, v) (__atomic_fetch_add(p, v, __ATOMIC_RELAXED))
+#define FETCH_SUB_RELAXED(p, v) (__atomic_fetch_sub(p, v, __ATOMIC_RELAXED))
+#define FETCH_ADD(p, v)         (__atomic_fetch_add(p, v, __ATOMIC_SEQ_CST))
+#define FETCH_SUB(p, v)         (__atomic_fetch_sub(p, v, __ATOMIC_SEQ_CST))
+
+#endif /* OUROBOROS_LIB_ATOMICS_H */
diff --git a/src/ipcpd/eth/eth.c b/src/ipcpd/eth/eth.c
index d7894cf6..7981ade5 100644
--- a/src/ipcpd/eth/eth.c
+++ b/src/ipcpd/eth/eth.c
@@ -37,6 +37,7 @@
 
 #include "config.h"
 
+#include <ouroboros/atomics.h>
 #include <ouroboros/endian.h>
 #include <ouroboros/hash.h>
 #include <ouroboros/errno.h>
@@ -53,12 +54,10 @@
 #include <ouroboros/pthread.h>
 #include <ouroboros/rib.h>
 
-#ifdef IPCP_ETH_FLOW_STATS
-#define LOAD_RELAXED(p)         __atomic_load_n(p, __ATOMIC_RELAXED)
-#define FETCH_ADD_RELAXED(p, v) __atomic_fetch_add(p, v, __ATOMIC_RELAXED)
-#define FETCH_SUB_RELAXED(p, v) __atomic_fetch_sub(p, v, __ATOMIC_RELAXED)
-#else
+#ifndef IPCP_ETH_FLOW_STATS
+#undef  FETCH_ADD_RELAXED
 #define FETCH_ADD_RELAXED(p, v) ((void) 0)
+#undef  FETCH_SUB_RELAXED
 #define FETCH_SUB_RELAXED(p, v) ((void) 0)
 #endif
 
diff --git a/src/lib/ssm/pool.c b/src/lib/ssm/pool.c
index e9a81688..f2c94133 100644
--- a/src/lib/ssm/pool.c
+++ b/src/lib/ssm/pool.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <ouroboros/atomics.h>
 #include <ouroboros/errno.h>
 #include <ouroboros/pthread.h>
 #include <ouroboros/ssm_pool.h>
@@ -75,26 +76,6 @@ static const struct ssm_size_class_cfg ssm_pup_cfg[SSM_POOL_MAX_CLASSES] = {
 
 #define GET_SHARD_FOR_PID(pid) ((int)((pid) % SSM_POOL_SHARDS))
 
-#define LOAD_RELAXED(ptr)                                                      \
-        (__atomic_load_n(ptr, __ATOMIC_RELAXED))
-
-#define LOAD_ACQUIRE(ptr)                                                      \
-        (__atomic_load_n(ptr, __ATOMIC_ACQUIRE))
-
-#define STORE_RELEASE(ptr, val)                                                \
-        (__atomic_store_n(ptr, val, __ATOMIC_RELEASE))
-
-#define LOAD(ptr)                                                              \
-        (__atomic_load_n(ptr, __ATOMIC_SEQ_CST))
-
-#define STORE(ptr, val)                                                        \
-        (__atomic_store_n(ptr, val, __ATOMIC_SEQ_CST))
-
-#define FETCH_ADD(ptr, val)                                                    \
-        (__atomic_fetch_add(ptr, val, __ATOMIC_SEQ_CST))
-
-#define FETCH_SUB(ptr, val)                                                    \
-        (__atomic_fetch_sub(ptr, val, __ATOMIC_SEQ_CST))
 
 #define SSM_FILE_SIZE (SSM_POOL_TOTAL_SIZE + sizeof(struct _ssm_pool_hdr))
 #define SSM_GSPP_FILE_SIZE (SSM_GSPP_TOTAL_SIZE + sizeof(struct _ssm_pool_hdr))