tests: use thread-id.h wrapper

[urcu.git] / tests / test_urcu_lfs.c

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 45ed0628fc3dc5073fe10329319ed6860aa4133b..b2a33712a5aefa488d69bfc746291c72471cd463 100644 (file)
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -39,29 +39,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
 #endif
@@ -175,9 +157,8 @@ static void *thr_enqueuer(void *_count)
 {
        unsigned long long *count = _count;
 
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "enqueuer", (unsigned long) pthread_self(),
-                       (unsigned long) gettid());
+       printf_verbose("thread_begin %s, tid %lu\n",
+                       "enqueuer", urcu_get_thread_id());
 
        set_affinity();
 
@@ -208,11 +189,11 @@ fail:
 
        count[0] = URCU_TLS(nr_enqueues);
        count[1] = URCU_TLS(nr_successful_enqueues);
-       printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
-                      "enqueues %llu successful_enqueues %llu\n",
-                      pthread_self(),
-                       (unsigned long) gettid(),
-                      URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
+       printf_verbose("enqueuer thread_end, tid %lu, "
+                       "enqueues %llu successful_enqueues %llu\n",
+                       urcu_get_thread_id(),
+                       URCU_TLS(nr_enqueues),
+                       URCU_TLS(nr_successful_enqueues));
        return ((void*)1);
 
 }
@@ -274,10 +255,10 @@ void do_test_pop_all(enum test_sync sync)
 static void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
+       unsigned int counter = 0;
 
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "dequeuer", (unsigned long) pthread_self(),
-                       (unsigned long) gettid());
+       printf_verbose("thread_begin %s, tid %lu\n",
+                       "dequeuer", urcu_get_thread_id());
 
        set_affinity();
 
@@ -291,8 +272,6 @@ static void *thr_dequeuer(void *_count)
        assert(test_pop || test_pop_all);
 
        for (;;) {
-               unsigned int counter = 0;
-
                if (test_pop && test_pop_all) {
                        /* both pop and pop all */
                        if (counter & 1)
@@ -315,11 +294,11 @@ static void *thr_dequeuer(void *_count)
 
        rcu_unregister_thread();
 
-       printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
-                      "dequeues %llu, successful_dequeues %llu\n",
-                      pthread_self(),
-                       (unsigned long) gettid(),
-                      URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues));
+       printf_verbose("dequeuer thread_end, tid %lu, "
+                       "dequeues %llu, successful_dequeues %llu\n",
+                       urcu_get_thread_id(),
+                       URCU_TLS(nr_dequeues),
+                       URCU_TLS(nr_successful_dequeues));
        count[0] = URCU_TLS(nr_dequeues);
        count[1] = URCU_TLS(nr_successful_dequeues);
        return ((void*)2);
@@ -343,15 +322,17 @@ static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 
 static void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_dequeuers nr_enqueuers duration (s)", argv[0]);
-       printf(" [-d delay] (enqueuer period (in loops))");
-       printf(" [-c duration] (dequeuer period (in loops))");
-       printf(" [-v] (verbose output)");
-       printf(" [-a cpu#] [-a cpu#]... (affinity)");
-       printf(" [-p] (test pop)");
-       printf(" [-P] (test pop_all, enabled by default)");
-       printf(" [-R] (use RCU external synchronization)");
-       printf("      Note: default: no external synchronization used.");
+       printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
+       printf("        [-d delay] (enqueuer period (in loops))\n");
+       printf("        [-c duration] (dequeuer period (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
+       printf("        [-p] (test pop)\n");
+       printf("        [-P] (test pop_all, enabled by default)\n");
+       printf("        [-R] (use RCU external synchronization)\n");
+       printf("                Note: default: no external synchronization used.\n");
        printf("\n");
 }
 
@@ -450,9 +431,8 @@ int main(int argc, char **argv)
                printf_verbose("External sync: none.\n");
        printf_verbose("Writer delay : %lu loops.\n", rduration);
        printf_verbose("Reader duration : %lu loops.\n", wdelay);
-       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_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers);
        tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);