X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_rwlock_timing.c;h=d916071f61b459f9ea4f8ea24ec74445cd2b6e9c;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hp=bc7737002596a5856f278b5fcd1898292d069c83;hpb=6ff854acfa013195bdb71dddc654ec76a4c296c9;p=userspace-rcu.git

diff --git a/tests/test_rwlock_timing.c b/tests/test_rwlock_timing.c
index bc77370..d916071 100644
--- a/tests/test_rwlock_timing.c
+++ b/tests/test_rwlock_timing.c
@@ -35,24 +35,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>
 
@@ -86,9 +69,8 @@ void *thr_reader(void *arg)
 	int i, j;
 	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);
 
 	time1 = caa_get_cycles();
@@ -104,9 +86,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);
 
 }
@@ -116,9 +97,8 @@ void *thr_writer(void *arg)
 	int i, j;
 	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++) {
@@ -133,9 +113,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);
 }
 
@@ -155,14 +134,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", (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,