X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.c;h=cd3beff7337da0225a3c55f36b19e9499ec052e9;hb=9340c38dbff1b407f35008f7f585a238fbd4de1c;hp=5bdf259492156681e23e873d79286b5ca55093fb;hpb=15302e2854ad9f1377ec81e331c1bec7a54a5621;p=urcu.git

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index 5bdf259..cd3beff 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -53,7 +53,7 @@
 void __attribute__((destructor)) rcu_exit(void);
 
 static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
-struct urcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
+struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
 
 /*
  * Active attempts to check for reader Q.S. before calling futex().
@@ -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)) {