X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.c;h=3f21be3160731979b6f39455b1202ccf00849237;hb=8f50d1ce191ad5f85384c0afbf1ac5b7516ea79f;hp=d1f5d91846af8f8098eacab85a588d945ab9873f;hpb=b39e3baec9feaf3623461eff85f08f216f3bb492;p=urcu.git

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index d1f5d91..3f21be3 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <poll.h>
 
+#define BUILD_QSBR_LIB
 #include "urcu-qsbr-static.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-qsbr.h"
@@ -105,11 +106,6 @@ static void force_mb_single_thread(struct reader_registry *index)
 }
 #endif /* #ifdef HAS_INCOHERENT_CACHES */
 
-static void force_mb_all_threads(void)
-{
-	smp_mb();
-}
-
 static void wait_for_quiescent_state(void)
 {
 	struct reader_registry *index;
@@ -121,8 +117,7 @@ static void wait_for_quiescent_state(void)
 	 */
 	for (index = registry; index < registry + num_readers; index++) {
 #ifndef HAS_INCOHERENT_CACHES
-		while (rcu_gp_ongoing(index->rcu_reader_qs_gp) &&
-		       (*index->rcu_reader_qs_gp - urcu_gp_ctr < 0))
+		while (rcu_gp_ongoing(index->rcu_reader_qs_gp))
 			cpu_relax();
 #else /* #ifndef HAS_INCOHERENT_CACHES */
 		int wait_loops = 0;
@@ -130,8 +125,7 @@ static void wait_for_quiescent_state(void)
 		 * BUSY-LOOP. Force the reader thread to commit its
 		 * rcu_reader_qs_gp update to memory if we wait for too long.
 		 */
-		while (rcu_gp_ongoing(index->rcu_reader_qs_gp) &&
-		       (*index->rcu_reader_qs_gp - urcu_gp_ctr < 0)) {
+		while (rcu_gp_ongoing(index->rcu_reader_qs_gp)) {
 			if (wait_loops++ == KICK_READER_LOOPS) {
 				force_mb_single_thread(index);
 				wait_loops = 0;
@@ -154,18 +148,18 @@ void synchronize_rcu(void)
 	 * our own quiescent state. This allows using synchronize_rcu() in
 	 * threads registered as readers.
 	 */
+	smp_mb();
 	if (was_online)
-		_rcu_thread_offline();
+		STORE_SHARED(rcu_reader_qs_gp, 0);
 
 	internal_urcu_lock();
-	force_mb_all_threads();
-	urcu_gp_ctr += 2;
+	STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr + 2);
 	wait_for_quiescent_state();
-	force_mb_all_threads();
 	internal_urcu_unlock();
 
 	if (was_online)
-		_rcu_thread_online();
+		_STORE_SHARED(rcu_reader_qs_gp, LOAD_SHARED(urcu_gp_ctr) + 1);
+	smp_mb();
 }
 
 /*