X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Furcu-memb.h;h=f64cb579189d95d57ba33de08159b14e3945724b;hb=be152bdb1af23ed3781fbda231597bad750ee977;hp=a64efee3f9019b0bc37dbcddebc285c4b5b0fb5b;hpb=4477a87021ffbfbfdb2a2084d05a084171343d36;p=urcu.git

diff --git a/include/urcu/static/urcu-memb.h b/include/urcu/static/urcu-memb.h
index a64efee..f64cb57 100644
--- a/include/urcu/static/urcu-memb.h
+++ b/include/urcu/static/urcu-memb.h
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <urcu/debug.h>
 #include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
@@ -42,7 +43,6 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/debug.h>
 #include <urcu/static/urcu-common.h>
 
 #ifdef __cplusplus
@@ -86,9 +86,9 @@ extern DECLARE_URCU_TLS(struct urcu_reader, urcu_memb_reader);
 
 /*
  * Helper for _rcu_read_lock().  The format of urcu_memb_gp.ctr (as well as
- * the per-thread rcu_reader.ctr) has the upper bits containing a count of
- * _rcu_read_lock() nesting, and a lower-order bit that contains either zero
- * or URCU_GP_CTR_PHASE.  The smp_mb_slave() ensures that the accesses in
+ * the per-thread rcu_reader.ctr) has the lower-order bits containing a count of
+ * _rcu_read_lock() nesting, and a single high-order URCU_BP_GP_CTR_PHASE bit
+ * that contains either zero or one.  The smp_mb_slave() ensures that the accesses in
  * _rcu_read_lock() happen before the subsequent read-side critical section.
  */
 static inline void _urcu_memb_read_lock_update(unsigned long tmp)
@@ -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);
 }
 
@@ -141,7 +141,7 @@ static inline void _urcu_memb_read_unlock_update_and_wakeup(unsigned long tmp)
 }
 
 /*
- * Exit an RCU read-side crtical section.  Both this function and its
+ * Exit an RCU read-side critical section.  Both this function and its
  * helper are smaller than 10 lines of code, and are intended to be
  * usable by non-LGPL code, as called out in LGPL.
  */
@@ -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 */
 }