X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fmap%2Furcu.h;h=dd7a6914b93f5c2325dae840824b89d1790b2259;hp=ea12f346306221e08812e9ad5fd1f2346be619d5;hb=541d828d3101283ccdb1e25fa5a885e1d1743c1a;hpb=d4b99c015229978810319cfd42e1c9763772fad8

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index ea12f34..dd7a691 100644
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -38,6 +38,31 @@
 #define RCU_MEMBARRIER
 #endif
 
+/*
+ * RCU_MEMBARRIER is only possibly available on Linux. Fallback to
+ * RCU_MB
+ * otherwise.
+ */
+#if !defined(__linux__) && defined(RCU_MEMBARRIER)
+#undef RCU_MEMBARRIER
+#define RCU_MB
+#endif
+
+#ifdef RCU_MEMBARRIER
+#include <syscall.h>
+
+/* If the headers do not support SYS_membarrier, statically use RCU_MB */
+#ifdef SYS_membarrier
+# define MEMBARRIER_EXPEDITED		(1 << 0)
+# define MEMBARRIER_DELAYED		(1 << 1)
+# define MEMBARRIER_QUERY		(1 << 16)
+# define membarrier(...)		syscall(SYS_membarrier, __VA_ARGS__)
+#else
+# undef RCU_MEMBARRIER
+# define RCU_MB
+#endif
+#endif
+
 #ifdef RCU_MEMBARRIER
 
 #define rcu_read_lock			rcu_read_lock_memb
@@ -70,17 +95,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_memb
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_memb
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_memb
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_memb
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_memb
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_memb
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_memb
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_memb
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_memb
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_memb
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_memb
+#define rcu_flavor			rcu_flavor_memb
 
 #elif defined(RCU_SIGNAL)
 
@@ -114,17 +129,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_sig
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_sig
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_sig
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_sig
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_sig
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_sig
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_sig
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_sig
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_sig
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_sig
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_sig
+#define rcu_flavor			rcu_flavor_sig
 
 #elif defined(RCU_MB)
 
@@ -158,17 +163,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_mb
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_mb
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_mb
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_mb
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_mb
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_mb
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_mb
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_mb
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_mb
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_mb
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_mb
+#define rcu_flavor			rcu_flavor_mb
 
 #else