X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_qsbr_gc.c;h=e0a2004f09d253f57a49babc749abd0cc9b80c15;hp=34d0a1791dff2030000ca3eb48b475092da97fa2;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=0663713865a25964c2932943c48e59ddf3caecd8

diff --git a/tests/test_urcu_qsbr_gc.c b/tests/test_urcu_qsbr_gc.c
index 34d0a17..e0a2004 100644
--- a/tests/test_urcu_qsbr_gc.c
+++ b/tests/test_urcu_qsbr_gc.c
@@ -36,29 +36,11 @@
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
 #include "cpuset.h"
-
-#ifdef __linux__
-#include <syscall.h>
-#endif
+#include "thread-id.h"
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
-#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
-
 #define _LGPL_SOURCE
 #include <urcu-qsbr.h>
 
@@ -192,9 +174,8 @@ void *thr_reader(void *_count)
 	unsigned long long *count = _count;
 	struct test_array *local_ptr;
 
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_begin %s, tid %lu\n",
+			"reader", urcu_get_thread_id());
 
 	set_affinity();
 
@@ -225,9 +206,8 @@ void *thr_reader(void *_count)
 	rcu_unregister_thread();
 
 	*count = URCU_TLS(nr_reads);
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_end %s, tid %lu\n",
+			"reader", urcu_get_thread_id());
 	return ((void*)1);
 
 }
@@ -272,9 +252,8 @@ void *thr_writer(void *data)
 	struct test_array *new, *old;
 #endif
 
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_begin %s, tid %lu\n",
+			"writer", urcu_get_thread_id());
 
 	set_affinity();
 
@@ -299,9 +278,8 @@ void *thr_writer(void *data)
 			loop_sleep(wdelay);
 	}
 
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
+	printf_verbose("thread_end %s, tid %lu\n",
+			"writer", urcu_get_thread_id());
 	tot_nr_writes[wtidx] = URCU_TLS(nr_writes);
 	return ((void*)2);
 }
@@ -415,15 +393,14 @@ int main(int argc, char **argv)
 		duration, nr_readers, nr_writers);
 	printf_verbose("Writer delay : %lu loops.\n", wdelay);
 	printf_verbose("Reader duration : %lu loops.\n", rduration);
-	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", (unsigned long) pthread_self(),
-			(unsigned long) gettid());
-
-	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
-	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
-	count_reader = malloc(sizeof(*count_reader) * nr_readers);
-	tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers);
-	pending_reclaims = malloc(sizeof(*pending_reclaims) * nr_writers);
+	printf_verbose("thread %-6s, tid %lu\n",
+			"main", urcu_get_thread_id());
+
+	tid_reader = calloc(nr_readers, sizeof(*tid_reader));
+	tid_writer = calloc(nr_writers, sizeof(*tid_writer));
+	count_reader = calloc(nr_readers, sizeof(*count_reader));
+	tot_nr_writes = calloc(nr_writers, sizeof(*tot_nr_writes));
+	pending_reclaims = calloc(nr_writers, sizeof(*pending_reclaims));
 	if (reclaim_batch * sizeof(*pending_reclaims[i].queue)
 			< CAA_CACHE_LINE_SIZE)
 		for (i = 0; i < nr_writers; i++)