X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu-qsbr-static.h;h=887dc3d64e949ab843a248846e4286b4fbdbf7bb;hb=ac258107eb2e669d6f8210c86164f1b2a028f5fc;hp=b18affeb1be6ea203b7636e5f235011cd01580b7;hpb=4e560c1794fe68ca77ae9bcaa60c5e4f5ed0856e;p=urcu.git

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index b18affe..887dc3d 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <assert.h>
+#include <limits.h>
 
 #include <compiler.h>
 #include <arch.h>
@@ -160,28 +161,31 @@ static inline void reader_barrier()
 	smp_mb();
 }
 
+#define RCU_GP_ONLINE		(1UL << 0)
+#define RCU_GP_COUNT		(1UL << 1)
+
 /*
  * Global quiescent period counter with low-order bits unused.
  * Using a int rather than a char to eliminate false register dependencies
  * causing stalls on some architectures.
  */
-extern long urcu_gp_ctr;
+extern unsigned long urcu_gp_ctr;
 
-extern long __thread rcu_reader_qs_gp;
+extern unsigned long __thread rcu_reader_qs_gp;
 
-static inline int rcu_gp_ongoing(long *value)
+static inline int rcu_gp_ongoing(unsigned long *value)
 {
-	long reader_gp;
+	unsigned long reader_gp;
 
 	if (value == NULL)
 		return 0;
 	reader_gp = LOAD_SHARED(*value);
-	return (reader_gp & 1) && (reader_gp - urcu_gp_ctr < 0);
+	return reader_gp && (reader_gp - urcu_gp_ctr > ULONG_MAX / 2);
 }
 
 static inline void _rcu_read_lock(void)
 {
-	rcu_assert(rcu_reader_qs_gp & 1);
+	rcu_assert(rcu_reader_qs_gp);
 }
 
 static inline void _rcu_read_unlock(void)
@@ -191,7 +195,7 @@ static inline void _rcu_read_unlock(void)
 static inline void _rcu_quiescent_state(void)
 {
 	smp_mb();	
-	_STORE_SHARED(rcu_reader_qs_gp, _LOAD_SHARED(urcu_gp_ctr) + 1);
+	_STORE_SHARED(rcu_reader_qs_gp, _LOAD_SHARED(urcu_gp_ctr));
 	smp_mb();
 }
 
@@ -203,7 +207,7 @@ static inline void _rcu_thread_offline(void)
 
 static inline void _rcu_thread_online(void)
 {
-	_STORE_SHARED(rcu_reader_qs_gp, LOAD_SHARED(urcu_gp_ctr) + 1);
+	_STORE_SHARED(rcu_reader_qs_gp, LOAD_SHARED(urcu_gp_ctr));
 	smp_mb();
 }