Introduce urcu_assert and registration check

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

diff --git a/urcu/static/urcu-qsbr.h b/urcu/static/urcu-qsbr.h
index 8f2ca32a2f111c4b1469c010c5f1fcb4669039a5..8e46820d7ae7436812f5ce8c9d1b1cc7d57f6900 100644 (file)
--- a/urcu/static/urcu-qsbr.h
+++ b/urcu/static/urcu-qsbr.h
@@ -31,7 +31,6 @@
 
 #include <stdlib.h>
 #include <pthread.h>
-#include <assert.h>
 #include <limits.h>
 #include <unistd.h>
 #include <stdint.h>
@@ -43,6 +42,7 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
+#include <urcu/debug.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,12 +56,6 @@ extern "C" {
  * This is required to permit relinking with newer versions of the library.
  */
 
-#ifdef DEBUG_RCU
-#define rcu_assert(args...)    assert(args)
-#else
-#define rcu_assert(args...)
-#endif
-
 enum rcu_state {
        RCU_READER_ACTIVE_CURRENT,
        RCU_READER_ACTIVE_OLD,
@@ -91,6 +85,8 @@ struct rcu_reader {
        struct cds_list_head node __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
        int waiting;
        pthread_t tid;
+       /* Reader registered flag, for internal checks. */
+       unsigned int registered:1;
 };
 
 extern DECLARE_URCU_TLS(struct rcu_reader, rcu_reader);
@@ -106,8 +102,13 @@ static inline void wake_up_gp(void)
                if (uatomic_read(&rcu_gp.futex) != -1)
                        return;
                uatomic_set(&rcu_gp.futex, 0);
-               futex_noasync(&rcu_gp.futex, FUTEX_WAKE, 1,
-                     NULL, NULL, 0);
+               /*
+                * Ignoring return value until we can make this function
+                * return something (because urcu_die() is not publicly
+                * exposed).
+                */
+               (void) futex_noasync(&rcu_gp.futex, FUTEX_WAKE, 1,
+                               NULL, NULL, 0);
        }
 }
 
@@ -132,7 +133,7 @@ static inline enum rcu_state rcu_reader_state(unsigned long *ctr)
  */
 static inline void _rcu_read_lock(void)
 {
-       rcu_assert(URCU_TLS(rcu_reader).ctr);
+       urcu_assert(URCU_TLS(rcu_reader).ctr);
 }
 
 /*
@@ -144,6 +145,7 @@ static inline void _rcu_read_lock(void)
  */
 static inline void _rcu_read_unlock(void)
 {
+       urcu_assert(URCU_TLS(rcu_reader).ctr);
 }
 
 /*
@@ -192,6 +194,7 @@ static inline void _rcu_quiescent_state(void)
 {
        unsigned long gp_ctr;
 
+       urcu_assert(URCU_TLS(rcu_reader).registered);
        if ((gp_ctr = CMM_LOAD_SHARED(rcu_gp.ctr)) == URCU_TLS(rcu_reader).ctr)
                return;
        _rcu_quiescent_state_update_and_wakeup(gp_ctr);
@@ -207,6 +210,7 @@ static inline void _rcu_quiescent_state(void)
  */
 static inline void _rcu_thread_offline(void)
 {
+       urcu_assert(URCU_TLS(rcu_reader).registered);
        cmm_smp_mb();
        CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, 0);
        cmm_smp_mb();   /* write URCU_TLS(rcu_reader).ctr before read futex */
@@ -224,6 +228,7 @@ static inline void _rcu_thread_offline(void)
  */
 static inline void _rcu_thread_online(void)
 {
+       urcu_assert(URCU_TLS(rcu_reader).registered);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
        _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, CMM_LOAD_SHARED(rcu_gp.ctr));
        cmm_smp_mb();