X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_gc.c;h=21c5d5608d37e79eba0d21b3261ee908ac12d366;hp=4eaa61b777d0dd6460b4f0ae196bb5ca0d833c28;hb=a0b7f7ea3fc3339a1c42caffd53ce9f056e5b901;hpb=de10a5858ea0638c9059bb3315794ccb1401f404

diff --git a/tests/test_urcu_gc.c b/tests/test_urcu_gc.c
index 4eaa61b..21c5d56 100644
--- a/tests/test_urcu_gc.c
+++ b/tests/test_urcu_gc.c
@@ -218,11 +218,11 @@ void *thr_reader(void *_count)
 		debug_yield_read();
 		if (local_ptr)
 			assert(local_ptr->a == 8);
-		if (unlikely(rduration))
+		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
 		rcu_read_unlock();
 		nr_reads++;
-		if (unlikely(!test_duration_read()))
+		if (caa_unlikely(!test_duration_read()))
 			break;
 	}
 
@@ -259,7 +259,7 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
 	*pending_reclaims[wtidx].head = old;
 	pending_reclaims[wtidx].head++;
 
-	if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
+	if (caa_likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
 			< reclaim_batch))
 		return;
 
@@ -291,13 +291,13 @@ void *thr_writer(void *data)
 		new->a = 8;
 		old = rcu_xchg_pointer(&test_rcu_pointer, new);
 #endif
-		if (unlikely(wduration))
+		if (caa_unlikely(wduration))
 			loop_sleep(wduration);
 		rcu_gc_reclaim(wtidx, old);
 		nr_writes++;
-		if (unlikely(!test_duration_write()))
+		if (caa_unlikely(!test_duration_write()))
 			break;
-		if (unlikely(wdelay))
+		if (caa_unlikely(wdelay))
 			loop_sleep(wdelay);
 	}