X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=041361799b89694b8f9e8c9f7af0d142d040a44e;hp=7cef820d59fd7ff4223b0a9cc01f6834073d7b13;hb=e90ad78457151a8faec9d77934b292f458082386;hpb=f02bbafc4513879a545b6b5ad932ea5ff220230d

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 7cef820..0413617 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-qsbr.h for linking
  * dynamically with the userspace rcu QSBR library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -135,7 +135,7 @@ struct rcu_reader {
 	/* Data used by both reader and synchronize_rcu() */
 	unsigned long ctr;
 	/* Data used for registry */
-	struct list_head head __attribute__((aligned(CACHE_LINE_SIZE)));
+	struct list_head node __attribute__((aligned(CACHE_LINE_SIZE)));
 	pthread_t tid;
 };
 
@@ -155,27 +155,13 @@ static inline void wake_up_gp(void)
 	}
 }
 
-#if (BITS_PER_LONG < 64)
-static inline int rcu_gp_ongoing(unsigned long *value)
+static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
-	unsigned long reader_gp;
+	unsigned long v;
 
-	if (value == NULL)
-		return 0;
-	reader_gp = LOAD_SHARED(*value);
-	return reader_gp && ((reader_gp ^ rcu_gp_ctr) & RCU_GP_CTR);
+	v = LOAD_SHARED(*ctr);
+	return v && (v != rcu_gp_ctr);
 }
-#else /* !(BITS_PER_LONG < 64) */
-static inline int rcu_gp_ongoing(unsigned long *value)
-{
-	unsigned long reader_gp;
-
-	if (value == NULL)
-		return 0;
-	reader_gp = LOAD_SHARED(*value);
-	return reader_gp && (reader_gp - rcu_gp_ctr > ULONG_MAX / 2);
-}
-#endif  /* !(BITS_PER_LONG < 64) */
 
 static inline void _rcu_read_lock(void)
 {