X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu.h;h=424980650474953be7c7e081ec0fe07f5e14d034;hb=6e8b8429a09800f5a50f0410f5ec4cd95b46974b;hp=a32fb94247fcfa11e4f5330d5e278821ab3a1e04;hpb=69a757c902c0cfb6245da18339b297b9ca6f94e0;p=urcu.git

diff --git a/urcu.h b/urcu.h
index a32fb94..4249806 100644
--- a/urcu.h
+++ b/urcu.h
@@ -17,7 +17,6 @@
  * Distributed under GPLv2
  */
 
-#define __USE_GNU
 #include <stdlib.h>
 #include <pthread.h>
 
@@ -163,11 +162,12 @@ static inline void debug_yield_init(void)
 #endif
 
 /*
- * Limiting the nesting level to 256 to keep instructions small in the read
- * fast-path.
+ * The trick here is that RCU_GP_CTR_BIT must be a multiple of 8 so we can use a
+ * full 8-bits, 16-bits or 32-bits bitmask for the lower order bits.
  */
 #define RCU_GP_COUNT		(1U << 0)
-#define RCU_GP_CTR_BIT		(1U << 8)
+/* Use the amount of bits equal to half of the architecture long size */
+#define RCU_GP_CTR_BIT		(sizeof(long) << 2)
 #define RCU_GP_CTR_NEST_MASK	(RCU_GP_CTR_BIT - 1)
 
 /*
@@ -175,13 +175,13 @@ static inline void debug_yield_init(void)
  * Using a int rather than a char to eliminate false register dependencies
  * causing stalls on some architectures.
  */
-extern int urcu_gp_ctr;
+extern long urcu_gp_ctr;
 
-extern int __thread urcu_active_readers;
+extern long __thread urcu_active_readers;
 
 static inline int rcu_old_gp_ongoing(int *value)
 {
-	int v;
+	long v;
 
 	if (value == NULL)
 		return 0;
@@ -194,7 +194,7 @@ static inline int rcu_old_gp_ongoing(int *value)
 
 static inline void rcu_read_lock(void)
 {
-	int tmp;
+	long tmp;
 
 	debug_yield_read();
 	tmp = urcu_active_readers;