tests: use thread-id.h wrapper

[urcu.git] / tests / test_rwlock_timing.c

diff --git a/tests/test_rwlock_timing.c b/tests/test_rwlock_timing.c
index c5c947895458d19311f8ff8774f8579cfc521fc7..3ff7ee42eb6d455063c3f766c35b221370356612 100644 (file)
--- a/tests/test_rwlock_timing.c
+++ b/tests/test_rwlock_timing.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - test program
  *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -29,24 +30,12 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <pthread.h>
+#include <errno.h>
+
 #include <urcu/arch.h>
 
-#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>
 
@@ -72,19 +61,19 @@ static int num_write;
 #define NR_READ num_read
 #define NR_WRITE num_write
 
-static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *reader_time;
-static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *writer_time;
+static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
+static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
 void *thr_reader(void *arg)
 {
        int i, j;
        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);
 
-       time1 = get_cycles();
+       time1 = caa_get_cycles();
        for (i = 0; i < OUTER_READ_LOOP; i++) {
                for (j = 0; j < INNER_READ_LOOP; j++) {
                        pthread_rwlock_rdlock(&lock);
@@ -92,13 +81,13 @@ void *thr_reader(void *arg)
                        pthread_rwlock_unlock(&lock);
                }
        }
-       time2 = get_cycles();
+       time2 = caa_get_cycles();
 
        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);
 
 }
@@ -108,24 +97,24 @@ void *thr_writer(void *arg)
        int i, j;
        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++) {
                for (j = 0; j < INNER_WRITE_LOOP; j++) {
-                       time1 = get_cycles();
+                       time1 = caa_get_cycles();
                        pthread_rwlock_wrlock(&lock);
                        test_array.a = 8;
                        pthread_rwlock_unlock(&lock);
-                       time2 = get_cycles();
+                       time2 = caa_get_cycles();
                        writer_time[(unsigned long)arg] += time2 - time1;
                        usleep(1);
                }
        }
 
-       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);
 }
 
@@ -150,8 +139,8 @@ int main(int argc, char **argv)
        tid_reader = malloc(sizeof(*tid_reader) * num_read);
        tid_writer = malloc(sizeof(*tid_writer) * num_write);
 
-       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,