X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.c;h=d7178f43215dd0e70b45ccac3f43317aaf44035e;hb=aa46e09faad0962ef1b782c0e564d8d674d51160;hp=cd3beff7337da0225a3c55f36b19e9499ec052e9;hpb=9340c38dbff1b407f35008f7f585a238fbd4de1c;p=userspace-rcu.git

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index cd3beff..d7178f4 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -41,9 +41,9 @@
 #include "urcu/static/urcu-qsbr.h"
 #include "urcu-pointer.h"
 #include "urcu/tls-compat.h"
+#include "urcu/waitqueue-lifo.h"
 
 #include "urcu-die.h"
-#include "urcu-wait.h"
 
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #undef _LGPL_SOURCE
@@ -130,6 +130,8 @@ static void wait_for_readers(struct cds_list_head *input_readers,
 	 * current rcu_gp.ctr value.
 	 */
 	for (;;) {
+		if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS)
+			wait_loops++;
 		if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
 			uatomic_set(&rcu_gp.futex, -1);
 			/*
@@ -142,8 +144,6 @@ 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)) {