Rename `urcu_assert()` to `urcu_assert_debug()`

This is done in preparation for the addition of the `urcu_posix_assert()`
macro that will replace the vanilla `assert()` in the project.

We must continue to expose the `urcu_assert()` macro in the `urcu/debug.h`
file as it's used by at least one external project (LTTng-UST).

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I02f237450a35b57e37718c87a0596a5a14468f58

diff --git a/include/urcu/debug.h b/include/urcu/debug.h
index 4a7eac9aa70dd72d3be1b5d9036b7700847eeaf8..1920a7dd4f0a61c69ecd416c767d8ef9db73bb1d 100644 (file)
--- a/include/urcu/debug.h
+++ b/include/urcu/debug.h
@@ -24,9 +24,15 @@
 #include <urcu/config.h>
 
 #if defined(DEBUG_RCU) || defined(CONFIG_RCU_DEBUG)
-#define urcu_assert(...)       assert(__VA_ARGS__)
+# define urcu_assert_debug(...) assert(__VA_ARGS__)
 #else
-#define urcu_assert(...)
+# define urcu_assert_debug(...)
 #endif
 
+/*
+ * For backward compatibility reasons, this file must expose the urcu_assert()
+ * macro.
+ */
+#define urcu_assert(_cond) urcu_assert_debug(_cond)
+
 #endif /* _URCU_DEBUG_H */

diff --git a/include/urcu/static/urcu-bp.h b/include/urcu/static/urcu-bp.h
index 8614d68ad33434b9b3fd81e041733ea5753698c2..7f5d8736f4cd3b9c03cfb1617646bd9b1eb07df6 100644 (file)
--- a/include/urcu/static/urcu-bp.h
+++ b/include/urcu/static/urcu-bp.h
@@ -169,7 +169,7 @@ static inline void _urcu_bp_read_lock(void)
                urcu_bp_register(); /* If not yet registered. */
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
        tmp = URCU_TLS(urcu_bp_reader)->ctr;
-       urcu_assert((tmp & URCU_BP_GP_CTR_NEST_MASK) != URCU_BP_GP_CTR_NEST_MASK);
+       urcu_assert_debug((tmp & URCU_BP_GP_CTR_NEST_MASK) != URCU_BP_GP_CTR_NEST_MASK);
        _urcu_bp_read_lock_update(tmp);
 }
 
@@ -183,7 +183,7 @@ static inline void _urcu_bp_read_unlock(void)
        unsigned long tmp;
 
        tmp = URCU_TLS(urcu_bp_reader)->ctr;
-       urcu_assert(tmp & URCU_BP_GP_CTR_NEST_MASK);
+       urcu_assert_debug(tmp & URCU_BP_GP_CTR_NEST_MASK);
        /* Finish using rcu before decrementing the pointer. */
        urcu_bp_smp_mb_slave();
        _CMM_STORE_SHARED(URCU_TLS(urcu_bp_reader)->ctr, tmp - URCU_BP_GP_COUNT);

diff --git a/include/urcu/static/urcu-mb.h b/include/urcu/static/urcu-mb.h
index 577fdcdfcf54ba813b792bcf49bfdd7dd52123a1..20e604da64a1da6096b664f6791d2c8932ec7612 100644 (file)
--- a/include/urcu/static/urcu-mb.h
+++ b/include/urcu/static/urcu-mb.h
@@ -91,10 +91,10 @@ static inline void _urcu_mb_read_lock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_mb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_mb_reader).registered);
        cmm_barrier();
        tmp = URCU_TLS(urcu_mb_reader).ctr;
-       urcu_assert((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
        _urcu_mb_read_lock_update(tmp);
 }
 
@@ -126,9 +126,9 @@ static inline void _urcu_mb_read_unlock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_mb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_mb_reader).registered);
        tmp = URCU_TLS(urcu_mb_reader).ctr;
-       urcu_assert(tmp & URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug(tmp & URCU_GP_CTR_NEST_MASK);
        _urcu_mb_read_unlock_update_and_wakeup(tmp);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }

diff --git a/include/urcu/static/urcu-memb.h b/include/urcu/static/urcu-memb.h
index d30365a49f027ae09fc6c209d791a6196ce82d5b..65a985b355bc23a4ead607bdca0088bb007f15db 100644 (file)
--- a/include/urcu/static/urcu-memb.h
+++ b/include/urcu/static/urcu-memb.h
@@ -114,10 +114,10 @@ static inline void _urcu_memb_read_lock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_memb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_memb_reader).registered);
        cmm_barrier();
        tmp = URCU_TLS(urcu_memb_reader).ctr;
-       urcu_assert((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
        _urcu_memb_read_lock_update(tmp);
 }
 
@@ -149,9 +149,9 @@ static inline void _urcu_memb_read_unlock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_memb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_memb_reader).registered);
        tmp = URCU_TLS(urcu_memb_reader).ctr;
-       urcu_assert(tmp & URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug(tmp & URCU_GP_CTR_NEST_MASK);
        _urcu_memb_read_unlock_update_and_wakeup(tmp);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }

diff --git a/include/urcu/static/urcu-qsbr.h b/include/urcu/static/urcu-qsbr.h
index a6063e2de2de78f1f7a0da84f004b790825ad118..5eca3e24cf6b600c27f6d01c685cd5e6bbfc0392 100644 (file)
--- a/include/urcu/static/urcu-qsbr.h
+++ b/include/urcu/static/urcu-qsbr.h
@@ -117,7 +117,7 @@ static inline enum urcu_state urcu_qsbr_reader_state(unsigned long *ctr)
  */
 static inline void _urcu_qsbr_read_lock(void)
 {
-       urcu_assert(URCU_TLS(urcu_qsbr_reader).ctr);
+       urcu_assert_debug(URCU_TLS(urcu_qsbr_reader).ctr);
 }
 
 /*
@@ -129,7 +129,7 @@ static inline void _urcu_qsbr_read_lock(void)
  */
 static inline void _urcu_qsbr_read_unlock(void)
 {
-       urcu_assert(URCU_TLS(urcu_qsbr_reader).ctr);
+       urcu_assert_debug(URCU_TLS(urcu_qsbr_reader).ctr);
 }
 
 /*
@@ -178,7 +178,7 @@ static inline void _urcu_qsbr_quiescent_state(void)
 {
        unsigned long gp_ctr;
 
-       urcu_assert(URCU_TLS(urcu_qsbr_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_qsbr_reader).registered);
        if ((gp_ctr = CMM_LOAD_SHARED(urcu_qsbr_gp.ctr)) == URCU_TLS(urcu_qsbr_reader).ctr)
                return;
        _urcu_qsbr_quiescent_state_update_and_wakeup(gp_ctr);
@@ -194,7 +194,7 @@ static inline void _urcu_qsbr_quiescent_state(void)
  */
 static inline void _urcu_qsbr_thread_offline(void)
 {
-       urcu_assert(URCU_TLS(urcu_qsbr_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_qsbr_reader).registered);
        cmm_smp_mb();
        CMM_STORE_SHARED(URCU_TLS(urcu_qsbr_reader).ctr, 0);
        cmm_smp_mb();   /* write URCU_TLS(urcu_qsbr_reader).ctr before read futex */
@@ -212,7 +212,7 @@ static inline void _urcu_qsbr_thread_offline(void)
  */
 static inline void _urcu_qsbr_thread_online(void)
 {
-       urcu_assert(URCU_TLS(urcu_qsbr_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_qsbr_reader).registered);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
        _CMM_STORE_SHARED(URCU_TLS(urcu_qsbr_reader).ctr, CMM_LOAD_SHARED(urcu_qsbr_gp.ctr));
        cmm_smp_mb();

diff --git a/include/urcu/static/urcu-signal.h b/include/urcu/static/urcu-signal.h
index 4de6da00c7112c7d5e1b542497ab436d673f9048..56730e17d449494f81ba41d4f00e86a0178f21f6 100644 (file)
--- a/include/urcu/static/urcu-signal.h
+++ b/include/urcu/static/urcu-signal.h
@@ -92,10 +92,10 @@ static inline void _urcu_signal_read_lock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_signal_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_signal_reader).registered);
        cmm_barrier();
        tmp = URCU_TLS(urcu_signal_reader).ctr;
-       urcu_assert((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
        _urcu_signal_read_lock_update(tmp);
 }
 
@@ -127,9 +127,9 @@ static inline void _urcu_signal_read_unlock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_signal_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_signal_reader).registered);
        tmp = URCU_TLS(urcu_signal_reader).ctr;
-       urcu_assert(tmp & URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug(tmp & URCU_GP_CTR_NEST_MASK);
        _urcu_signal_read_unlock_update_and_wakeup(tmp);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }