X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_looplen.c;h=16674e76ac442343b77ea27d1994a5920cd6c9e7;hp=9e2ee2be780653badab3127f9f42bc07a58cb312;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=ec4e58a3aba2084440012f8ccac3a31eb6101183

diff --git a/tests/test_looplen.c b/tests/test_looplen.c
index 9e2ee2b..16674e7 100644
--- 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,26 +30,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
+#include <errno.h>
 
 #include <urcu/arch.h>
 
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-	return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-	return getpid();
-}
-#endif
-
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #else
@@ -57,10 +42,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 +59,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;