tests: use thread-id.h wrapper

[urcu.git] / tests / test_perthreadlock.c

diff --git a/tests/test_perthreadlock.c b/tests/test_perthreadlock.c
index 59c1ae6038e7fb9721a6adfaba19ed548a0aa19a..be6e59d557c9be527a0eeb1b671f4e4cf8dbdd48 100644 (file)
--- a/tests/test_perthreadlock.c
+++ b/tests/test_perthreadlock.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
-
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #else
@@ -193,9 +175,8 @@ void *thr_reader(void *data)
 {
        unsigned long tidx = (unsigned long)data;
 
-       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();
 
@@ -215,9 +196,8 @@ void *thr_reader(void *data)
        }
 
        tot_nr_reads[tidx] = 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);
 
 }
@@ -227,9 +207,8 @@ void *thr_writer(void *data)
        unsigned long wtidx = (unsigned long)data;
        long tidx;
 
-       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();
 
@@ -256,9 +235,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);
 }
@@ -364,8 +342,8 @@ 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());
+       printf_verbose("thread %-6s, tid %lu\n",
+                       "main", urcu_get_thread_id());
 
        tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
        tid_writer = malloc(sizeof(*tid_writer) * nr_writers);