Rename likely/unlikely to caa_likely/caa_unlikely

[urcu.git] / urcu / static / urcu-bp.h

diff --git a/urcu/static/urcu-bp.h b/urcu/static/urcu-bp.h
index 14c6cfecac3af01a3bc4680c36381736f37a30f7..8d221637a2756890d718faf55d7ca0a5a4a5ac23 100644 (file)
--- a/urcu/static/urcu-bp.h
+++ b/urcu/static/urcu-bp.h
@@ -31,13 +31,12 @@
 
 #include <stdlib.h>
 #include <pthread.h>
-#include <syscall.h>
 #include <unistd.h>
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/system.h>
-#include <urcu/uatomic_arch.h>
+#include <urcu/uatomic.h>
 #include <urcu/list.h>
 
 /*
@@ -52,11 +51,6 @@
 extern "C" {
 #endif
 
-/*
- * Active attempts to check for reader Q.S. before calling sleep().
- */
-#define RCU_QS_ACTIVE_ATTEMPTS 100
-
 #ifdef DEBUG_RCU
 #define rcu_assert(args...)    assert(args)
 #else
@@ -172,7 +166,7 @@ static inline void _rcu_read_lock(void)
        long tmp;
 
        /* Check if registered */
-       if (unlikely(!rcu_reader))
+       if (caa_unlikely(!rcu_reader))
                rcu_bp_register();
 
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
@@ -181,7 +175,7 @@ static inline void _rcu_read_lock(void)
         * rcu_gp_ctr is
         *   RCU_GP_COUNT | (~RCU_GP_CTR_PHASE or RCU_GP_CTR_PHASE)
         */
-       if (likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
+       if (caa_likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
                _CMM_STORE_SHARED(rcu_reader->ctr, _CMM_LOAD_SHARED(rcu_gp_ctr));
                /*
                 * Set active readers count for outermost nesting level before