Move mb() outside of the synchronize C.S.

[urcu.git] / urcu-qsbr.c

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index d1f5d91846af8f8098eacab85a588d945ab9873f..b387536adc6ef923d8254934b41955389002f0fc 100644 (file)
--- 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"
@@ -121,8 +122,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 +130,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;
@@ -157,12 +156,12 @@ void synchronize_rcu(void)
        if (was_online)
                _rcu_thread_offline();
 
-       internal_urcu_lock();
        force_mb_all_threads();
-       urcu_gp_ctr += 2;
+       internal_urcu_lock();
+       STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr + 2);
        wait_for_quiescent_state();
-       force_mb_all_threads();
        internal_urcu_unlock();
+       force_mb_all_threads();
 
        if (was_online)
                _rcu_thread_online();