Update makefile to compiler for 32-bit architectures on x86_64

[urcu.git] / urcu-qsbr.c

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index e077eac8f2b4b4bc7c44cadaf0f96d012be60fe3..ba6e02af27f3a18b60f26d56779bb5d4f869524e 100644 (file)
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -42,20 +42,20 @@ pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 /*
  * Global grace period counter.
  */
-long urcu_gp_ctr = 0;
+unsigned long urcu_gp_ctr = RCU_GP_ONLINE;
 
 /*
  * Written to only by each individual reader. Read by both the reader and the
  * writers.
  */
-long __thread rcu_reader_qs_gp;
+unsigned long __thread rcu_reader_qs_gp;
 
 /* Thread IDs of registered readers */
 #define INIT_NUM_THREADS 4
 
 struct reader_registry {
        pthread_t tid;
-       long *rcu_reader_qs_gp;
+       unsigned long *rcu_reader_qs_gp;
 };
 
 #ifdef DEBUG_YIELD
@@ -106,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;
@@ -144,27 +139,27 @@ static void wait_for_quiescent_state(void)
 
 void synchronize_rcu(void)
 {
-       int was_online;
+       unsigned long was_online;
 
-       was_online = rcu_reader_qs_gp & 1;
+       was_online = rcu_reader_qs_gp;
 
        /*
         * Mark the writer thread offline to make sure we don't wait for
         * 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();
-       STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr + 2);
+       STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr + RCU_GP_CTR);
        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));
+       smp_mb();
 }
 
 /*