Cleanup: doc/examples makefile

[urcu.git] / tests / test_urcu_timing.c

diff --git a/tests/test_urcu_timing.c b/tests/test_urcu_timing.c
index 44235ce5c774e4bdf6091c08cac432f38325fade..e31b676ca506adf3dac9d20bdee7c6fba01a47fb 100644 (file)
--- a/tests/test_urcu_timing.c
+++ b/tests/test_urcu_timing.c
@@ -32,24 +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.h>
@@ -106,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();
@@ -130,8 +113,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);
 
 }
@@ -142,8 +125,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++) {
@@ -170,8 +153,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);
 }
 
@@ -191,13 +174,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,