Rename likely/unlikely to caa_likely/caa_unlikely

[urcu.git] / tests / test_urcu_gc.c

diff --git a/tests/test_urcu_gc.c b/tests/test_urcu_gc.c
index d0f7e6e8e3f2466269c295b3394eb08fa16a4d37..21c5d5608d37e79eba0d21b3261ee908ac12d366 100644 (file)
--- a/tests/test_urcu_gc.c
+++ b/tests/test_urcu_gc.c
@@ -31,12 +31,15 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
@@ -215,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;
        }
 
@@ -256,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;
 
@@ -288,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);
        }