Fix: membarrier fallback symbol conflict

[urcu.git] / urcu / map / urcu.h

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index 5942fad207102784e0c0f7f14f53734807c1de88..77b37215734bfa163fbe680a3582a5b8a0b2af66 100644 (file)
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -44,13 +44,15 @@
 #define _rcu_read_lock                 _rcu_read_lock_memb
 #define rcu_read_unlock                        rcu_read_unlock_memb
 #define _rcu_read_unlock               _rcu_read_unlock_memb
+#define rcu_read_ongoing               rcu_read_ongoing_memb
+#define _rcu_read_ongoing              _rcu_read_ongoing_memb
 #define rcu_register_thread            rcu_register_thread_memb
 #define rcu_unregister_thread          rcu_unregister_thread_memb
 #define rcu_init                       rcu_init_memb
 #define rcu_exit                       rcu_exit_memb
 #define synchronize_rcu                        synchronize_rcu_memb
 #define rcu_reader                     rcu_reader_memb
-#define rcu_gp_ctr                     rcu_gp_ctr_memb
+#define rcu_gp                         rcu_gp_memb
 
 #define get_cpu_call_rcu_data          get_cpu_call_rcu_data_memb
 #define get_call_rcu_thread            get_call_rcu_thread_memb
@@ -63,12 +65,25 @@
 #define create_all_cpu_call_rcu_data   create_all_cpu_call_rcu_data_memb
 #define free_all_cpu_call_rcu_data     free_all_cpu_call_rcu_data_memb
 #define call_rcu                       call_rcu_memb
+#define call_rcu_data_free             call_rcu_data_free_memb
+#define call_rcu_before_fork           call_rcu_before_fork_memb
+#define call_rcu_after_fork_parent     call_rcu_after_fork_parent_memb
+#define call_rcu_after_fork_child      call_rcu_after_fork_child_memb
 
 #define defer_rcu                      defer_rcu_memb
 #define rcu_defer_register_thread      rcu_defer_register_thread_memb
 #define rcu_defer_unregister_thread    rcu_defer_unregister_thread_memb
 #define rcu_defer_barrier              rcu_defer_barrier_memb
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_memb
+#define rcu_defer_exit                 rcu_defer_exit_memb
+
+#define rcu_flavor                     rcu_flavor_memb
+
+#define rcu_yield_active               rcu_yield_active_memb
+#define rcu_rand_yield                 rcu_rand_yield_memb
+
+/* Specific to MEMBARRIER flavor */
+#define rcu_has_sys_membarrier         rcu_has_sys_membarrier_memb
 
 #elif defined(RCU_SIGNAL)
 
@@ -76,13 +91,15 @@
 #define _rcu_read_lock                 _rcu_read_lock_sig
 #define rcu_read_unlock                        rcu_read_unlock_sig
 #define _rcu_read_unlock               _rcu_read_unlock_sig
+#define rcu_read_ongoing               rcu_read_ongoing_sig
+#define _rcu_read_ongoing              _rcu_read_ongoing_sig
 #define rcu_register_thread            rcu_register_thread_sig
 #define rcu_unregister_thread          rcu_unregister_thread_sig
 #define rcu_init                       rcu_init_sig
 #define rcu_exit                       rcu_exit_sig
 #define synchronize_rcu                        synchronize_rcu_sig
 #define rcu_reader                     rcu_reader_sig
-#define rcu_gp_ctr                     rcu_gp_ctr_sig
+#define rcu_gp                         rcu_gp_sig
 
 #define get_cpu_call_rcu_data          get_cpu_call_rcu_data_sig
 #define get_call_rcu_thread            get_call_rcu_thread_sig
@@ -95,12 +112,22 @@
 #define create_all_cpu_call_rcu_data   create_all_cpu_call_rcu_data_sig
 #define free_all_cpu_call_rcu_data     free_all_cpu_call_rcu_data_sig
 #define call_rcu                       call_rcu_sig
+#define call_rcu_data_free             call_rcu_data_free_sig
+#define call_rcu_before_fork           call_rcu_before_fork_sig
+#define call_rcu_after_fork_parent     call_rcu_after_fork_parent_sig
+#define call_rcu_after_fork_child      call_rcu_after_fork_child_sig
 
 #define defer_rcu                      defer_rcu_sig
 #define rcu_defer_register_thread      rcu_defer_register_thread_sig
 #define rcu_defer_unregister_thread    rcu_defer_unregister_thread_sig
 #define rcu_defer_barrier              rcu_defer_barrier_sig
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_sig
+#define rcu_defer_exit                 rcu_defer_exit_sig
+
+#define rcu_flavor                     rcu_flavor_sig
+
+#define rcu_yield_active               rcu_yield_active_sig
+#define rcu_rand_yield                 rcu_rand_yield_sig
 
 #elif defined(RCU_MB)
 
@@ -108,13 +135,15 @@
 #define _rcu_read_lock                 _rcu_read_lock_mb
 #define rcu_read_unlock                        rcu_read_unlock_mb
 #define _rcu_read_unlock               _rcu_read_unlock_mb
+#define rcu_read_ongoing               rcu_read_ongoing_mb
+#define _rcu_read_ongoing              _rcu_read_ongoing_mb
 #define rcu_register_thread            rcu_register_thread_mb
 #define rcu_unregister_thread          rcu_unregister_thread_mb
 #define rcu_init                       rcu_init_mb
 #define rcu_exit                       rcu_exit_mb
 #define synchronize_rcu                        synchronize_rcu_mb
 #define rcu_reader                     rcu_reader_mb
-#define rcu_gp_ctr                     rcu_gp_ctr_mb
+#define rcu_gp                         rcu_gp_mb
 
 #define get_cpu_call_rcu_data          get_cpu_call_rcu_data_mb
 #define get_call_rcu_thread            get_call_rcu_thread_mb
@@ -127,12 +156,22 @@
 #define create_all_cpu_call_rcu_data   create_all_cpu_call_rcu_data_mb
 #define free_all_cpu_call_rcu_data     free_all_cpu_call_rcu_data_mb
 #define call_rcu                       call_rcu_mb
+#define call_rcu_data_free             call_rcu_data_free_mb
+#define call_rcu_before_fork           call_rcu_before_fork_mb
+#define call_rcu_after_fork_parent     call_rcu_after_fork_parent_mb
+#define call_rcu_after_fork_child      call_rcu_after_fork_child_mb
 
 #define defer_rcu                      defer_rcu_mb
 #define rcu_defer_register_thread      rcu_defer_register_thread_mb
 #define rcu_defer_unregister_thread    rcu_defer_unregister_thread_mb
 #define rcu_defer_barrier              rcu_defer_barrier_mb
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_mb
+#define rcu_defer_exit                 rcu_defer_exit_mb
+
+#define rcu_flavor                     rcu_flavor_mb
+
+#define rcu_yield_active               rcu_yield_active_mb
+#define rcu_rand_yield                 rcu_rand_yield_mb
 
 #else