Test cleanup: replace "l" parameter by "loops"

[urcu.git] / tests / test_looplen.c

diff --git a/tests/test_looplen.c b/tests/test_looplen.c
index 9e2ee2be780653badab3127f9f42bc07a58cb312..e1bd2ea25a037238cba132ba61d2879b1fd36f24 100644 (file)
--- a/tests/test_looplen.c
+++ b/tests/test_looplen.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - test program
  *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,11 +30,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
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -57,10 +61,10 @@ static inline pid_t gettid(void)
 #endif
 #include <urcu.h>
 
-static inline void loop_sleep(unsigned long l)
+static inline void loop_sleep(unsigned long loops)
 {
-       while(l-- != 0)
-               cpu_relax();
+       while (loops-- != 0)
+               caa_cpu_relax();
 }
 
 #define LOOPS 1048576
@@ -74,9 +78,9 @@ int main(int argc, char **argv)
        double cpl;
 
        for (i = 0; i < TESTS; i++) {
-               time1 = get_cycles();
+               time1 = caa_get_cycles();
                loop_sleep(LOOPS);
-               time2 = get_cycles();
+               time2 = caa_get_cycles();
                time_tot += time2 - time1;
        }
        cpl = ((double)time_tot) / (double)TESTS / (double)LOOPS;