Cleanup: urcu: remove unused membarrier "group" parameter

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

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index af8eee442d3849f5756423d7337d16c93f712f34..92185d7629a72f2ceb70d109f24bd959e062529d 100644 (file)
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -42,6 +42,7 @@
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
 #include <urcu/rand-compat.h>
+#include <urcu/debug.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,16 +80,7 @@ enum rcu_state {
        RCU_READER_INACTIVE,
 };
 
-#ifdef DEBUG_RCU
-#define rcu_assert(args...)    assert(args)
-#else
-#define rcu_assert(args...)
-#endif
-
 /*
- * RCU memory barrier broadcast group. Currently, only broadcast to all process
- * threads is supported (group 0).
- *
  * Slave barriers are only guaranteed to be ordered wrt master barriers.
  *
  * The pair ordering is detailed as (O: ordered, X: not ordered) :
@@ -97,13 +89,10 @@ enum rcu_state {
  *        master   O      O
  */
 
-#define MB_GROUP_ALL           0
-#define RCU_MB_GROUP           MB_GROUP_ALL
-
 #ifdef RCU_MEMBARRIER
 extern int rcu_has_sys_membarrier;
 
-static inline void smp_mb_slave(int group)
+static inline void smp_mb_slave(void)
 {
        if (caa_likely(rcu_has_sys_membarrier))
                cmm_barrier();
@@ -113,14 +102,14 @@ static inline void smp_mb_slave(int group)
 #endif
 
 #ifdef RCU_MB
-static inline void smp_mb_slave(int group)
+static inline void smp_mb_slave(void)
 {
        cmm_smp_mb();
 }
 #endif
 
 #ifdef RCU_SIGNAL
-static inline void smp_mb_slave(int group)
+static inline void smp_mb_slave(void)
 {
        cmm_barrier();
 }
@@ -157,6 +146,8 @@ struct rcu_reader {
        /* Data used for registry */
        struct cds_list_head node __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
        pthread_t tid;
+       /* Reader registered flag, for internal checks. */
+       unsigned int registered:1;
 };
 
 extern DECLARE_URCU_TLS(struct rcu_reader, rcu_reader);
@@ -205,7 +196,7 @@ static inline void _rcu_read_lock_update(unsigned long tmp)
 {
        if (caa_likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
                _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, _CMM_LOAD_SHARED(rcu_gp.ctr));
-               smp_mb_slave(RCU_MB_GROUP);
+               smp_mb_slave();
        } else
                _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp + RCU_GP_COUNT);
 }
@@ -224,8 +215,10 @@ static inline void _rcu_read_lock(void)
 {
        unsigned long tmp;
 
+       urcu_assert(URCU_TLS(rcu_reader).registered);
        cmm_barrier();
        tmp = URCU_TLS(rcu_reader).ctr;
+       urcu_assert((tmp & RCU_GP_CTR_NEST_MASK) != RCU_GP_CTR_NEST_MASK);
        _rcu_read_lock_update(tmp);
 }
 
@@ -240,12 +233,12 @@ static inline void _rcu_read_lock(void)
 static inline void _rcu_read_unlock_update_and_wakeup(unsigned long tmp)
 {
        if (caa_likely((tmp & RCU_GP_CTR_NEST_MASK) == RCU_GP_COUNT)) {
-               smp_mb_slave(RCU_MB_GROUP);
-               _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, URCU_TLS(rcu_reader).ctr - RCU_GP_COUNT);
-               smp_mb_slave(RCU_MB_GROUP);
+               smp_mb_slave();
+               _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp - RCU_GP_COUNT);
+               smp_mb_slave();
                wake_up_gp();
        } else
-               _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, URCU_TLS(rcu_reader).ctr - RCU_GP_COUNT);
+               _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp - RCU_GP_COUNT);
 }
 
 /*
@@ -257,7 +250,9 @@ static inline void _rcu_read_unlock(void)
 {
        unsigned long tmp;
 
+       urcu_assert(URCU_TLS(rcu_reader).registered);
        tmp = URCU_TLS(rcu_reader).ctr;
+       urcu_assert(tmp & RCU_GP_CTR_NEST_MASK);
        _rcu_read_unlock_update_and_wakeup(tmp);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }