X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_qsbr_timing.c;h=9b5195d9605e4ba914cf76cdeab14f2c63019c12;hp=792554867735702c007736c2713125ffa8060686;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=9abc187826737149c44ef037ec0b2f3ed0fa36c2

diff --git a/tests/test_urcu_qsbr_timing.c b/tests/test_urcu_qsbr_timing.c
index 7925548..9b5195d 100644
--- a/tests/test_urcu_qsbr_timing.c
+++ b/tests/test_urcu_qsbr_timing.c
@@ -32,25 +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-qsbr.h>
@@ -107,8 +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", pthread_self(), (unsigned long)gettid());
+	printf("thread_begin %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	sleep(2);
 
 	rcu_register_thread();
@@ -132,8 +114,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", pthread_self(), (unsigned long)gettid());
+	printf("thread_end %s, tid %lu\n",
+		"reader", urcu_get_thread_id());
 	return ((void*)1);
 
 }
@@ -144,8 +126,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", 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++) {
@@ -172,8 +154,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);
 }
 
@@ -193,13 +175,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());
 
 	for (i = 0; i < NR_READ; i++) {
 		err = pthread_create(&tid_reader[i], NULL, thr_reader,