X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_perthreadlock_timing.c;h=97bdd044eae4d231621456efbd4b010b3d72c1aa;hp=bc20ed0599cf4610fe42146f6456da90fc66f3d3;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=bc2433a9853a945a825c244e9ccfe341b73b2ceb

diff --git a/tests/test_perthreadlock_timing.c b/tests/test_perthreadlock_timing.c
index bc20ed0..97bdd04 100644
--- a/tests/test_perthreadlock_timing.c
+++ b/tests/test_perthreadlock_timing.c
@@ -34,24 +34,7 @@
 
 #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"
 
 #include <urcu.h>
 
@@ -90,8 +73,8 @@ void *thr_reader(void *arg)
 	cycles_t time1, time2;
 	long tidx = (long)arg;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
+	printf("thread_begin %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	sleep(2);
 
 	time1 = caa_get_cycles();
@@ -107,8 +90,8 @@ void *thr_reader(void *arg)
 	reader_time[tidx] = time2 - time1;
 
 	sleep(2);
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
+	printf("thread_end %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	return ((void*)1);
 
 }
@@ -119,8 +102,8 @@ void *thr_writer(void *arg)
 	long tidx;
 	cycles_t time1, time2;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", 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++) {
@@ -139,8 +122,8 @@ void *thr_writer(void *arg)
 		}
 	}
 
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", pthread_self(), (unsigned long)gettid());
+	printf("thread_end %s, tid %lu\n",
+		"writer", urcu_get_thread_id());
 	return ((void*)2);
 }
 
@@ -160,13 +143,13 @@ int main(int argc, char **argv)
 	num_read = atoi(argv[1]);
 	num_write = atoi(argv[2]);
 
-	reader_time = malloc(sizeof(*reader_time) * num_read);
-	writer_time = malloc(sizeof(*writer_time) * num_write);
-	tid_reader = malloc(sizeof(*tid_reader) * num_read);
-	tid_writer = malloc(sizeof(*tid_writer) * num_write);
+	reader_time = calloc(num_read, sizeof(*reader_time));
+	writer_time = calloc(num_write, sizeof(*writer_time));
+	tid_reader = calloc(num_read, sizeof(*tid_reader));
+	tid_writer = calloc(num_write, sizeof(*tid_writer));
 
-	printf("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", pthread_self(), (unsigned long)gettid());
+	printf("thread %-6s, tid %lu\n",
+		"main", urcu_get_thread_id());
 
 	per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ);