Make stdatomic-systems (i.e. risc-v) usable outside of the

statistics module. Had to shuffle some headers around to resolve
changed dependencies.

Author: sobomax

atomic.h

@@ -212,6 +212,13 @@ static __inline__ void atomic_dec(atomic_t *v)
 
 #endif
 
+#if defined(NO_ATOMIC_OPS) && defined(HAVE_STDATOMIC)
+#undef NO_ATOMIC_OPS
+#include <stdatomic.h>
+
+typedef _Atomic(unsigned long) atomic_t;
+#else
+
 /* C11 stdatomics wrappers */
 #define atomic_init(a, v) atomic_set(a, v)
 #define atomic_store(a, v) atomic_set(a, v)
@@ -221,5 +228,6 @@ static __inline__ void atomic_dec(atomic_t *v)
 		atomic_add(v, a);\
 	else \
 		atomic_sub(-(v), a);
+#endif
 
 #endif

mem/common.h

@@ -39,6 +39,16 @@ extern void *rpm_block;
 #define INLINE_ALLOC
 #endif
 
+enum osips_mm {
+	MM_NONE,
+	MM_F_MALLOC,
+	MM_Q_MALLOC,
+	MM_HP_MALLOC,
+	MM_F_MALLOC_DBG,
+	MM_Q_MALLOC_DBG,
+	MM_HP_MALLOC_DBG,
+};
+
 #if defined F_MALLOC
 #include "f_malloc.h"
 #endif
@@ -56,16 +66,6 @@ extern char *mem_warming_pattern_file;
 extern int mem_warming_percentage;
 extern enum osips_mm mem_allocator;
 
-enum osips_mm {
-	MM_NONE,
-	MM_F_MALLOC,
-	MM_Q_MALLOC,
-	MM_HP_MALLOC,
-	MM_F_MALLOC_DBG,
-	MM_Q_MALLOC_DBG,
-	MM_HP_MALLOC_DBG,
-};
-
 /* returns -1 if @mm_name is unrecognized */
 int set_global_mm(const char *mm_name);
 

mem/hp_malloc.h

@@ -26,7 +26,6 @@
 
 #include <sys/time.h>
 
-#include "../statistics.h"
 #include "../config.h"
 #include "../globals.h"
 #include "common.h"
@@ -40,15 +39,6 @@ struct hp_frag;
 struct hp_frag_lnk;
 struct hp_block;
 
-#ifndef HP_MALLOC_FAST_STATS
-extern stat_var *shm_used;
-extern stat_var *shm_rused;
-extern stat_var *shm_frags;
-#endif
-extern stat_var *rpm_used;
-extern stat_var *rpm_rused;
-extern stat_var *rpm_frags;
-
 #include "hp_malloc_stats.h"
 #include "meminfo.h"
 
@@ -71,6 +61,17 @@ extern stat_var *rpm_frags;
 
 #define HP_TOTAL_HASH_SIZE (HP_HASH_SIZE + HP_EXTRA_HASH_SIZE)
 
+#include "../statistics.h"
+
+#ifndef HP_MALLOC_FAST_STATS
+extern stat_var *shm_used;
+extern stat_var *shm_rused;
+extern stat_var *shm_frags;
+#endif
+extern stat_var *rpm_used;
+extern stat_var *rpm_rused;
+extern stat_var *rpm_frags;
+
 /* get the fragment which corresponds to a pointer */
 #define HP_FRAG(p) \
 	((struct hp_frag *)(p) - 1)

statistics.c

@@ -34,13 +34,9 @@
  * \brief Statistics support
  */
 
-#ifdef HAVE_STDATOMIC
-#include <stdatomic.h>
-#else
-#include "atomic.h"
-#endif
 #include <string.h>
 
+#include "atomic.h"
 #include "mem/shm_mem.h"
 #include "mem/rpm_mem.h"
 #include "mi/mi.h"

statistics.h

@@ -34,11 +34,7 @@
 #ifndef _STATISTICS_H_
 #define _STATISTICS_H_
 
-#ifdef HAVE_STDATOMIC
-#include <stdatomic.h>
-#else
 #include "atomic.h"
-#endif
 
 #include "hash_func.h"
 
@@ -59,11 +55,7 @@
 #ifdef NO_ATOMIC_OPS
 typedef unsigned int stat_val;
 #else
-# ifdef HAVE_STDATOMIC
-typedef _Atomic(unsigned long) stat_val;
-# else
 typedef atomic_t stat_val;
-# endif
 #endif
 
 typedef unsigned long (*stat_function)(void *);