X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_timing.c;h=4fbdcca8f594f5681696609e75ce110d28e6e7e9;hp=4de8896b77d024abe2d11b43ba5b9414f1bbbef3;hb=94df63189704b8f6483c737988df3728f5e13c2d;hpb=550265b2c2de28e0fe566f71fb1cab64fa620efa

diff --git a/tests/test_urcu_timing.c b/tests/test_urcu_timing.c
index 4de8896..4fbdcca 100644
--- a/tests/test_urcu_timing.c
+++ b/tests/test_urcu_timing.c
@@ -32,24 +32,7 @@
 #include <errno.h>
 #include <urcu/arch.h>
 
-#ifdef __linux__
-#include <syscall.h>
-#endif
-
-#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
+#include "thread-id.h"
 
 #define _LGPL_SOURCE
 #include <urcu.h>
@@ -106,9 +89,8 @@ void *thr_reader(void *arg)
 	struct test_array *local_ptr;
 	cycles_t time1, time2;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf("thread_begin %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	sleep(2);
 
 	rcu_register_thread();
@@ -131,9 +113,8 @@ void *thr_reader(void *arg)
 	reader_time[(unsigned long)arg] = time2 - time1;
 
 	sleep(2);
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf("thread_end %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	return ((void*)1);
 
 }
@@ -144,9 +125,8 @@ void *thr_writer(void *arg)
 	struct test_array *new, *old;
 	cycles_t time1, time2;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf("thread_begin %s, tid %lu\n",
+		"writer", urcu_get_thread_id());
 	sleep(2);
 
 	for (i = 0; i < OUTER_WRITE_LOOP; i++) {
@@ -173,9 +153,8 @@ void *thr_writer(void *arg)
 		}
 	}
 
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf("thread_end %s, tid %lu\n",
+		"writer", urcu_get_thread_id());
 	return ((void*)2);
 }
 
@@ -200,9 +179,8 @@ int main(int argc, char **argv)
 	tid_reader = malloc(sizeof(*tid_reader) * num_read);
 	tid_writer = malloc(sizeof(*tid_writer) * num_write);
 
-	printf("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf("thread %-6s, tid %lu\n",
+		"main", urcu_get_thread_id());
 
 	for (i = 0; i < NR_READ; i++) {
 		err = pthread_create(&tid_reader[i], NULL, thr_reader,