Fix: struct urcu_gp broke multiflavor

Add mapping to namespace urcu_gp.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index 5bdf259492156681e23e873d79286b5ca55093fb..d6adc5bfaafa9d4d851842bad7d398967b081eec 100644 (file)
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -53,7 +53,7 @@
 void __attribute__((destructor)) rcu_exit(void);
 
 static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
-struct urcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
+struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
 
 /*
  * Active attempts to check for reader Q.S. before calling futex().

diff --git a/urcu.c b/urcu.c
index da6839f0c25b88b4262e9a615bd197220789c185..b3f94da9a2b733e30c08eb014c095933e2e13561 100644 (file)
--- a/urcu.c
+++ b/urcu.c
@@ -83,7 +83,7 @@ void __attribute__((destructor)) rcu_exit(void);
 #endif
 
 static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
-struct urcu_gp rcu_gp = { .ctr = RCU_GP_COUNT };
+struct rcu_gp rcu_gp = { .ctr = RCU_GP_COUNT };
 
 /*
  * Written to only by each individual reader. Read by both the reader and the

diff --git a/urcu/map/urcu-qsbr.h b/urcu/map/urcu-qsbr.h
index c40af35c2230d55483d4785165f40bb7766d9a73..e3261ff0c316b88efd309360d43b3d6fa2d7b33b 100644 (file)
--- a/urcu/map/urcu-qsbr.h
+++ b/urcu/map/urcu-qsbr.h
@@ -49,8 +49,7 @@
 #define rcu_exit                       rcu_exit_qsbr
 #define synchronize_rcu                        synchronize_rcu_qsbr
 #define rcu_reader                     rcu_reader_qsbr
-#define rcu_gp_ctr                     rcu_gp_ctr_qsbr
-#define rcu_gp_futex                   rcu_gp_futex_qsbr
+#define rcu_gp                         rcu_gp_qsbr
 
 #define get_cpu_call_rcu_data          get_cpu_call_rcu_data_qsbr
 #define get_call_rcu_thread            get_call_rcu_thread_qsbr

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index becc6a0f438a4eda367e3f779885a633534bdc71..217bff56d99a48e763b9abdaedaabcd5429c1580 100644 (file)
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -77,8 +77,7 @@
 #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_futex                   rcu_gp_futex_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
@@ -125,8 +124,7 @@
 #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_futex                   rcu_gp_futex_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
@@ -170,8 +168,7 @@
 #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_futex                   rcu_gp_futex_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

diff --git a/urcu/static/urcu-qsbr.h b/urcu/static/urcu-qsbr.h
index ef1f600d6c2248d3b1320b2056ef49b661660873..690b77d528c38ef173aa1da91fc1d39dad0fed94 100644 (file)
--- a/urcu/static/urcu-qsbr.h
+++ b/urcu/static/urcu-qsbr.h
@@ -119,7 +119,7 @@ static inline void rcu_debug_yield_init(void)
 #define RCU_GP_ONLINE          (1UL << 0)
 #define RCU_GP_CTR             (1UL << 1)
 
-struct urcu_gp {
+struct rcu_gp {
        /*
         * Global quiescent period counter with low-order bits unused.
         * Using a int rather than a char to eliminate false register
@@ -130,7 +130,7 @@ struct urcu_gp {
        int32_t futex;
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
-extern struct urcu_gp rcu_gp;
+extern struct rcu_gp rcu_gp;
 
 struct rcu_reader {
        /* Data used by both reader and synchronize_rcu() */

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index bde1459f24100467a0fd42f90e82e54dc4e4815e..bee97eeb982f2979dae60a1d1ad95b96b9385393 100644 (file)
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -213,7 +213,7 @@ static inline void smp_mb_slave(int group)
 #define RCU_GP_CTR_PHASE       (1UL << (sizeof(unsigned long) << 2))
 #define RCU_GP_CTR_NEST_MASK   (RCU_GP_CTR_PHASE - 1)
 
-struct urcu_gp {
+struct rcu_gp {
        /*
         * Global grace period counter.
         * Contains the current RCU_GP_CTR_PHASE.
@@ -226,7 +226,7 @@ struct urcu_gp {
        int32_t futex;
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
-extern struct urcu_gp rcu_gp;
+extern struct rcu_gp rcu_gp;
 
 struct rcu_reader {
        /* Data used by both reader and synchronize_rcu() */