#include <unistd.h>
#include <stdint.h>
+#include <urcu/debug.h>
#include <urcu/config.h>
#include <urcu/compiler.h>
#include <urcu/arch.h>
#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
/*
* 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)
{
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);
}
{
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 */
}