X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fstatic%2Furcu-qsbr.h;h=8d5fd03107373b5cee0d51273624da5c05552bdb;hp=690b77d528c38ef173aa1da91fc1d39dad0fed94;hb=67ecffc0f530a7b5c4dd5111ea7dd3213da8eb91;hpb=4de0cd31491bcb93a19c14fc1eb2a2a23ce12855

diff --git a/urcu/static/urcu-qsbr.h b/urcu/static/urcu-qsbr.h
index 690b77d..8d5fd03 100644
--- 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,10 +42,11 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
+#include <urcu/debug.h>
 
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
 /*
  * This code section can only be included in LGPL 2.1 compatible source code.
@@ -56,66 +56,12 @@ 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,
 	RCU_READER_INACTIVE,
 };
 
-#ifdef DEBUG_YIELD
-#include <sched.h>
-#include <time.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#define RCU_YIELD_READ 	(1 << 0)
-#define RCU_YIELD_WRITE	(1 << 1)
-
-/* maximum sleep delay, in us */
-#define MAX_SLEEP 50
-
-extern unsigned int rcu_yield_active;
-extern DECLARE_URCU_TLS(unsigned int, rcu_rand_yield);
-
-static inline void rcu_debug_yield_read(void)
-{
-	if (rcu_yield_active & RCU_YIELD_READ)
-		if (rand_r(&URCU_TLS(rcu_rand_yield)) & 0x1)
-			usleep(rand_r(&URCU_TLS(rcu_rand_yield)) % MAX_SLEEP);
-}
-
-static inline void rcu_debug_yield_write(void)
-{
-	if (rcu_yield_active & RCU_YIELD_WRITE)
-		if (rand_r(&URCU_TLS(rcu_rand_yield)) & 0x1)
-			usleep(rand_r(&URCU_TLS(rcu_rand_yield)) % MAX_SLEEP);
-}
-
-static inline void rcu_debug_yield_init(void)
-{
-	URCU_TLS(rcu_rand_yield) = time(NULL) ^ (unsigned long) pthread_self();
-}
-#else
-static inline void rcu_debug_yield_read(void)
-{
-}
-
-static inline void rcu_debug_yield_write(void)
-{
-}
-
-static inline void rcu_debug_yield_init(void)
-{
-
-}
-#endif
-
 #define RCU_GP_ONLINE		(1UL << 0)
 #define RCU_GP_CTR		(1UL << 1)
 
@@ -139,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);
@@ -154,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);
 	}
 }
 
@@ -180,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);
 }
 
 /*
@@ -192,6 +145,7 @@ static inline void _rcu_read_lock(void)
  */
 static inline void _rcu_read_unlock(void)
 {
+	urcu_assert(URCU_TLS(rcu_reader).ctr);
 }
 
 /*
@@ -240,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);
@@ -255,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 */
@@ -272,12 +228,13 @@ 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();
 }
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif