X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.c;h=d02572513139eb5986529328c0066deb319cafc9;hb=e998132a6aeae4c12f2af1369c7831449be9b00c;hp=d6adc5bfaafa9d4d851842bad7d398967b081eec;hpb=4de0cd31491bcb93a19c14fc1eb2a2a23ce12855;p=urcu.git

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index d6adc5b..d025725 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -64,11 +64,11 @@ struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
  * Written to only by each individual reader. Read by both the reader and the
  * writers.
  */
-DEFINE_URCU_TLS(struct rcu_reader, rcu_reader);
+__DEFINE_URCU_TLS_GLOBAL(struct rcu_reader, rcu_reader);
 
 #ifdef DEBUG_YIELD
 unsigned int rcu_yield_active;
-DEFINE_URCU_TLS(unsigned int, rcu_rand_yield);
+__DEFINE_URCU_TLS_GLOBAL(unsigned int, rcu_rand_yield);
 #endif
 
 static CDS_LIST_HEAD(registry);
@@ -121,7 +121,7 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 			struct cds_list_head *cur_snap_readers,
 			struct cds_list_head *qsreaders)
 {
-	int wait_loops = 0;
+	unsigned int wait_loops = 0;
 	struct rcu_reader *index, *tmp;
 
 	/*
@@ -130,7 +130,6 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 	 * current rcu_gp.ctr value.
 	 */
 	for (;;) {
-		wait_loops++;
 		if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
 			uatomic_set(&rcu_gp.futex, -1);
 			/*
@@ -143,6 +142,8 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 			}
 			/* Write futex before read reader_gp */
 			cmm_smp_mb();
+		} else {
+			wait_loops++;
 		}
 		cds_list_for_each_entry_safe(index, tmp, input_readers, node) {
 			switch (rcu_reader_state(&index->ctr)) {