From: Mathieu Desnoyers Date: Wed, 19 Jun 2013 14:31:09 +0000 (-0400) Subject: tests: use thread-id.h wrapper X-Git-Tag: v0.8.0~66 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=94df63189704b8f6483c737988df3728f5e13c2d;p=urcu.git tests: use thread-id.h wrapper Signed-off-by: Mathieu Desnoyers --- diff --git a/tests/test_looplen.c b/tests/test_looplen.c index e1bd2ea..16674e7 100644 --- a/tests/test_looplen.c +++ b/tests/test_looplen.c @@ -35,25 +35,6 @@ #include -#ifdef __linux__ -#include -#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 - #ifndef DYNAMIC_LINK_TEST #define _LGPL_SOURCE #else diff --git a/tests/test_mutex.c b/tests/test_mutex.c index e5fbf1a..83adfdb 100644 --- a/tests/test_mutex.c +++ b/tests/test_mutex.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -189,9 +171,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(); @@ -211,9 +192,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); } @@ -222,9 +202,8 @@ void *thr_writer(void *data) { unsigned long wtidx = (unsigned long)data; - 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(); @@ -247,9 +226,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); } @@ -356,9 +334,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); diff --git a/tests/test_perthreadlock.c b/tests/test_perthreadlock.c index 59c1ae6..be6e59d 100644 --- a/tests/test_perthreadlock.c +++ b/tests/test_perthreadlock.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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); diff --git a/tests/test_perthreadlock_timing.c b/tests/test_perthreadlock_timing.c index d0cc11c..9321f03 100644 --- a/tests/test_perthreadlock_timing.c +++ b/tests/test_perthreadlock_timing.c @@ -34,24 +34,7 @@ #include -#ifdef __linux__ -#include -#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" #include @@ -90,9 +73,8 @@ void *thr_reader(void *arg) cycles_t time1, time2; long tidx = (long)arg; - printf("thread_begin %s, thread id : %lx, tid %lu\n", - "reader", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); sleep(2); time1 = caa_get_cycles(); @@ -108,9 +90,8 @@ void *thr_reader(void *arg) reader_time[tidx] = time2 - time1; sleep(2); - printf("thread_end %s, thread id : %lx, tid %lu\n", - "reader", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); return ((void*)1); } @@ -121,9 +102,8 @@ void *thr_writer(void *arg) long tidx; cycles_t time1, time2; - printf("thread_begin %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) 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++) { @@ -142,9 +122,8 @@ void *thr_writer(void *arg) } } - printf("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); return ((void*)2); } @@ -169,9 +148,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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread %-6s, tid %lu\n", + "main", urcu_get_thread_id()); per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ); diff --git a/tests/test_rwlock.c b/tests/test_rwlock.c index aa53b3b..287b14e 100644 --- a/tests/test_rwlock.c +++ b/tests/test_rwlock.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -185,9 +167,8 @@ void *thr_reader(void *_count) { unsigned long long *count = _count; - 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(); @@ -207,9 +188,8 @@ void *thr_reader(void *_count) } *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); } @@ -218,9 +198,8 @@ void *thr_writer(void *_count) { unsigned long long *count = _count; - 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(); @@ -243,9 +222,8 @@ void *thr_writer(void *_count) 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()); *count = URCU_TLS(nr_writes); return ((void*)2); } @@ -352,9 +330,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); diff --git a/tests/test_rwlock_timing.c b/tests/test_rwlock_timing.c index bc77370..3ff7ee4 100644 --- a/tests/test_rwlock_timing.c +++ b/tests/test_rwlock_timing.c @@ -35,24 +35,7 @@ #include -#ifdef __linux__ -#include -#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" #include @@ -86,9 +69,8 @@ void *thr_reader(void *arg) int i, j; cycles_t time1, time2; - printf("thread_begin %s, thread id : %lx, tid %lu\n", - "reader", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); sleep(2); time1 = caa_get_cycles(); @@ -104,9 +86,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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); return ((void*)1); } @@ -116,9 +97,8 @@ void *thr_writer(void *arg) int i, j; cycles_t time1, time2; - printf("thread_begin %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) 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++) { @@ -133,9 +113,8 @@ void *thr_writer(void *arg) } } - printf("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); return ((void*)2); } @@ -160,9 +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", (unsigned long) 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, diff --git a/tests/test_urcu.c b/tests/test_urcu.c index f77a2b5..3017e81 100644 --- a/tests/test_urcu.c +++ b/tests/test_urcu.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -180,9 +162,8 @@ void *thr_reader(void *_count) unsigned long long *count = _count; int *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(); @@ -216,9 +197,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); } @@ -228,9 +208,8 @@ void *thr_writer(void *_count) unsigned long long *count = _count; int *new, *old; - 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(); @@ -257,9 +236,8 @@ void *thr_writer(void *_count) 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()); *count = URCU_TLS(nr_writes); return ((void*)2); } @@ -365,9 +343,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); diff --git a/tests/test_urcu_assign.c b/tests/test_urcu_assign.c index 62cb5f4..67253da 100644 --- a/tests/test_urcu_assign.c +++ b/tests/test_urcu_assign.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -217,9 +199,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(); @@ -247,9 +228,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); } @@ -259,9 +239,8 @@ void *thr_writer(void *_count) unsigned long long *count = _count; struct test_array *new, *old; - 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(); @@ -290,9 +269,8 @@ void *thr_writer(void *_count) 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()); *count = URCU_TLS(nr_writes); return ((void*)2); } @@ -398,9 +376,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()); test_array = calloc(1, sizeof(*test_array) * ARRAY_SIZE); tid_reader = malloc(sizeof(*tid_reader) * nr_readers); diff --git a/tests/test_urcu_bp.c b/tests/test_urcu_bp.c index b59f16d..a0d6f11 100644 --- a/tests/test_urcu_bp.c +++ b/tests/test_urcu_bp.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -180,9 +162,8 @@ void *thr_reader(void *_count) unsigned long long *count = _count; int *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(); @@ -212,9 +193,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); } @@ -224,9 +204,8 @@ void *thr_writer(void *_count) unsigned long long *count = _count; int *new, *old; - 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(); @@ -252,9 +231,8 @@ void *thr_writer(void *_count) 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()); *count = URCU_TLS(nr_writes); return ((void*)2); } @@ -360,9 +338,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); diff --git a/tests/test_urcu_defer.c b/tests/test_urcu_defer.c index 8a6adeb..395014e 100644 --- a/tests/test_urcu_defer.c +++ b/tests/test_urcu_defer.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -188,9 +170,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(); @@ -218,9 +199,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); } @@ -239,9 +219,8 @@ void *thr_writer(void *data) struct test_array *new, *old = NULL; int ret; - 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(); @@ -279,9 +258,8 @@ void *thr_writer(void *data) rcu_defer_unregister_thread(); - 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); } @@ -387,9 +365,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); diff --git a/tests/test_urcu_gc.c b/tests/test_urcu_gc.c index da17a21..6e5cc1d 100644 --- a/tests/test_urcu_gc.c +++ b/tests/test_urcu_gc.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -196,9 +178,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(); @@ -226,9 +207,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); } @@ -273,9 +253,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(); @@ -300,9 +279,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,9 +393,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); diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c index c4c1192..9416224 100644 --- a/tests/test_urcu_hash.c +++ b/tests/test_urcu_hash.c @@ -201,9 +201,8 @@ unsigned long test_compare(const void *key1, size_t key1_len, void *thr_count(void *arg) { - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "counter", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "counter", urcu_get_thread_id()); rcu_register_thread(); @@ -548,9 +547,8 @@ int main(int argc, char **argv) write_pool_offset, write_pool_size); printf_verbose("Number of hash chains: %lu.\n", nr_hash_chains); - 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); if (!tid_reader) { diff --git a/tests/test_urcu_hash.h b/tests/test_urcu_hash.h index 50e720a..5a6a79a 100644 --- a/tests/test_urcu_hash.h +++ b/tests/test_urcu_hash.h @@ -38,10 +38,7 @@ #include #include "cpuset.h" - -#ifdef __linux__ -#include -#endif +#include "thread-id.h" #define DEFAULT_HASH_SIZE 32 #define DEFAULT_MIN_ALLOC_SIZE 1 @@ -71,23 +68,6 @@ #define poison_free(ptr) free(ptr) #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 - #ifndef DYNAMIC_LINK_TEST #define _LGPL_SOURCE #else diff --git a/tests/test_urcu_hash_rw.c b/tests/test_urcu_hash_rw.c index b6290e9..48dc1a8 100644 --- a/tests/test_urcu_hash_rw.c +++ b/tests/test_urcu_hash_rw.c @@ -65,9 +65,8 @@ void *test_hash_rw_thr_reader(void *_count) struct lfht_test_node *node; struct cds_lfht_iter iter; - 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(); @@ -107,11 +106,11 @@ void *test_hash_rw_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("readid : %lx, lookupfail %lu, lookupok %lu\n", - (unsigned long) pthread_self(), URCU_TLS(lookup_fail), + printf_verbose("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); + printf_verbose("read tid : %lx, lookupfail %lu, lookupok %lu\n", + urcu_get_thread_id(), + URCU_TLS(lookup_fail), URCU_TLS(lookup_ok)); return ((void*)1); @@ -125,9 +124,8 @@ void *test_hash_rw_thr_writer(void *_count) struct wr_count *count = _count; int ret; - 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(); @@ -211,12 +209,13 @@ void *test_hash_rw_thr_writer(void *_count) rcu_unregister_thread(); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); - printf_verbose("info id %lx: nr_add %lu, nr_addexist %lu, nr_del %lu, " - "nr_delnoent %lu\n", (unsigned long) pthread_self(), URCU_TLS(nr_add), - URCU_TLS(nr_addexist), URCU_TLS(nr_del), + printf_verbose("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); + printf_verbose("info tid %lu: nr_add %lu, nr_addexist %lu, nr_del %lu, " + "nr_delnoent %lu\n", urcu_get_thread_id(), + URCU_TLS(nr_add), + URCU_TLS(nr_addexist), + URCU_TLS(nr_del), URCU_TLS(nr_delnoent)); count->update_ops = URCU_TLS(nr_writes); count->add = URCU_TLS(nr_add); diff --git a/tests/test_urcu_hash_unique.c b/tests/test_urcu_hash_unique.c index 331c9bd..40d9e80 100644 --- a/tests/test_urcu_hash_unique.c +++ b/tests/test_urcu_hash_unique.c @@ -63,9 +63,8 @@ void *test_hash_unique_thr_reader(void *_count) { unsigned long long *count = _count; - 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(); @@ -109,11 +108,10 @@ void *test_hash_unique_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("readid : %lx, lookupfail %lu, lookupok %lu\n", - (unsigned long) pthread_self(), URCU_TLS(lookup_fail), + printf_verbose("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); + printf_verbose("read tid : %lu, lookupfail %lu, lookupok %lu\n", + urcu_get_thread_id(), URCU_TLS(lookup_fail), URCU_TLS(lookup_ok)); return ((void*)1); @@ -128,9 +126,8 @@ void *test_hash_unique_thr_writer(void *_count) int ret; int loc_add_unique; - 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(); @@ -223,12 +220,13 @@ void *test_hash_unique_thr_writer(void *_count) rcu_unregister_thread(); - printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); - printf_verbose("info id %lx: nr_add %lu, nr_addexist %lu, nr_del %lu, " - "nr_delnoent %lu\n", (unsigned long) pthread_self(), URCU_TLS(nr_add), - URCU_TLS(nr_addexist), URCU_TLS(nr_del), + printf_verbose("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); + printf_verbose("info tid %lu: nr_add %lu, nr_addexist %lu, nr_del %lu, " + "nr_delnoent %lu\n", urcu_get_thread_id(), + URCU_TLS(nr_add), + URCU_TLS(nr_addexist), + URCU_TLS(nr_del), URCU_TLS(nr_delnoent)); count->update_ops = URCU_TLS(nr_writes); count->add = URCU_TLS(nr_add); diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c index c648f76..52ca225 100644 --- a/tests/test_urcu_lfq.c +++ b/tests/test_urcu_lfq.c @@ -39,29 +39,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -163,9 +145,8 @@ 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(); @@ -198,11 +179,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", - (unsigned long) 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); } @@ -219,9 +200,8 @@ void *thr_dequeuer(void *_count) { unsigned long long *count = _count; - 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(); @@ -255,11 +235,11 @@ void *thr_dequeuer(void *_count) } rcu_unregister_thread(); - printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " - "dequeues %llu, successful_dequeues %llu\n", - (unsigned long) 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); @@ -367,9 +347,8 @@ int main(int argc, char **argv) duration, nr_enqueuers, nr_dequeuers); 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); diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index 707beca..b2a3371 100644 --- a/tests/test_urcu_lfs.c +++ b/tests/test_urcu_lfs.c @@ -39,29 +39,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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", - (unsigned long) 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); } @@ -276,9 +257,8 @@ 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(); @@ -314,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", - (unsigned long) 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); @@ -451,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); diff --git a/tests/test_urcu_lfs_rcu.c b/tests/test_urcu_lfs_rcu.c index f8e793e..89077dc 100644 --- a/tests/test_urcu_lfs_rcu.c +++ b/tests/test_urcu_lfs_rcu.c @@ -39,29 +39,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -166,9 +148,8 @@ 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(); @@ -200,11 +181,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); } @@ -221,9 +202,8 @@ void *thr_dequeuer(void *_count) { unsigned long long *count = _count; - 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(); @@ -256,11 +236,11 @@ 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); @@ -368,9 +348,8 @@ int main(int argc, char **argv) duration, nr_enqueuers, nr_dequeuers); 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); diff --git a/tests/test_urcu_qsbr.c b/tests/test_urcu_qsbr.c index 1bade60..2e9e2b2 100644 --- a/tests/test_urcu_qsbr.c +++ b/tests/test_urcu_qsbr.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -179,9 +161,8 @@ void *thr_reader(void *_count) unsigned long long *count = _count; int *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(); @@ -222,9 +203,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); } @@ -234,9 +214,8 @@ void *thr_writer(void *_count) unsigned long long *count = _count; int *new, *old; - 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(); @@ -263,9 +242,8 @@ void *thr_writer(void *_count) 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()); *count = URCU_TLS(nr_writes); return ((void*)2); } @@ -371,9 +349,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); diff --git a/tests/test_urcu_qsbr_gc.c b/tests/test_urcu_qsbr_gc.c index 34d0a17..64d2e24 100644 --- a/tests/test_urcu_qsbr_gc.c +++ b/tests/test_urcu_qsbr_gc.c @@ -36,29 +36,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -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,9 +393,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); diff --git a/tests/test_urcu_qsbr_timing.c b/tests/test_urcu_qsbr_timing.c index b50c95f..bb29301 100644 --- a/tests/test_urcu_qsbr_timing.c +++ b/tests/test_urcu_qsbr_timing.c @@ -32,25 +32,7 @@ #include #include - -#ifdef __linux__ -#include -#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 @@ -107,9 +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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); sleep(2); rcu_register_thread(); @@ -133,9 +114,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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); return ((void*)1); } @@ -146,9 +126,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", (unsigned long) 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++) { @@ -175,9 +154,8 @@ void *thr_writer(void *arg) } } - printf("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); return ((void*)2); } @@ -202,9 +180,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", (unsigned long) 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, diff --git a/tests/test_urcu_timing.c b/tests/test_urcu_timing.c index 4de8896..4fbdcca 100644 --- a/tests/test_urcu_timing.c +++ b/tests/test_urcu_timing.c @@ -32,24 +32,7 @@ #include #include -#ifdef __linux__ -#include -#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 @@ -106,9 +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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_begin %s, tid %lu\n", + "reader", urcu_get_thread_id()); sleep(2); rcu_register_thread(); @@ -131,9 +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", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "reader", urcu_get_thread_id()); return ((void*)1); } @@ -144,9 +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", (unsigned long) 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++) { @@ -173,9 +153,8 @@ void *thr_writer(void *arg) } } - printf("thread_end %s, thread id : %lx, tid %lu\n", - "writer", (unsigned long) pthread_self(), - (unsigned long) gettid()); + printf("thread_end %s, tid %lu\n", + "writer", urcu_get_thread_id()); return ((void*)2); } @@ -200,9 +179,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", (unsigned long) 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, diff --git a/tests/test_urcu_wfcq.c b/tests/test_urcu_wfcq.c index a3bd7e5..5a36c76 100644 --- a/tests/test_urcu_wfcq.c +++ b/tests/test_urcu_wfcq.c @@ -40,29 +40,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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; bool was_nonempty; - 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,14 +189,13 @@ fail: count[0] = URCU_TLS(nr_enqueues); count[1] = URCU_TLS(nr_successful_enqueues); count[2] = URCU_TLS(nr_empty_dest_enqueues); - printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, " - "enqueues %llu successful_enqueues %llu, " - "empty_dest_enqueues %llu\n", - pthread_self(), - (unsigned long) gettid(), - URCU_TLS(nr_enqueues), - URCU_TLS(nr_successful_enqueues), - URCU_TLS(nr_empty_dest_enqueues)); + printf_verbose("enqueuer thread_end, tid %lu, " + "enqueues %llu successful_enqueues %llu, " + "empty_dest_enqueues %llu\n", + urcu_get_thread_id(), + URCU_TLS(nr_enqueues), + URCU_TLS(nr_successful_enqueues), + URCU_TLS(nr_empty_dest_enqueues)); return ((void*)1); } @@ -287,9 +267,8 @@ 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(); @@ -317,13 +296,12 @@ static void *thr_dequeuer(void *_count) loop_sleep(rduration); } - printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " - "dequeues %llu, successful_dequeues %llu, " - "nr_splice %llu\n", - pthread_self(), - (unsigned long) gettid(), - URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues), - URCU_TLS(nr_splice)); + printf_verbose("dequeuer thread_end, tid %lu, " + "dequeues %llu, successful_dequeues %llu, " + "nr_splice %llu\n", + urcu_get_thread_id(), + URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues), + URCU_TLS(nr_splice)); count[0] = URCU_TLS(nr_dequeues); count[1] = URCU_TLS(nr_successful_dequeues); count[2] = URCU_TLS(nr_splice); @@ -483,9 +461,8 @@ int main(int argc, char **argv) printf_verbose("Wait for dequeuers to empty queue.\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); diff --git a/tests/test_urcu_wfq.c b/tests/test_urcu_wfq.c index 01e1592..db00d8c 100644 --- a/tests/test_urcu_wfq.c +++ b/tests/test_urcu_wfq.c @@ -39,29 +39,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -162,9 +144,8 @@ 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(); @@ -191,11 +172,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", - (unsigned long) 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); } @@ -204,9 +185,8 @@ void *thr_dequeuer(void *_count) { unsigned long long *count = _count; - 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(); @@ -230,11 +210,11 @@ void *thr_dequeuer(void *_count) loop_sleep(rduration); } - printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " - "dequeues %llu, successful_dequeues %llu\n", - (unsigned long) 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); @@ -339,9 +319,8 @@ int main(int argc, char **argv) duration, nr_enqueuers, nr_dequeuers); 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); diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c index 9ec95ef..2a031fe 100644 --- a/tests/test_urcu_wfs.c +++ b/tests/test_urcu_wfs.c @@ -40,29 +40,11 @@ #include #include #include "cpuset.h" - -#ifdef __linux__ -#include -#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 @@ -177,9 +159,8 @@ static void *thr_enqueuer(void *_count) unsigned long long *count = _count; bool was_nonempty; - 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(); @@ -210,14 +191,13 @@ fail: count[0] = URCU_TLS(nr_enqueues); count[1] = URCU_TLS(nr_successful_enqueues); count[2] = URCU_TLS(nr_empty_dest_enqueues); - printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, " - "enqueues %llu successful_enqueues %llu, " - "empty_dest_enqueues %llu\n", - (unsigned long) pthread_self(), - (unsigned long) gettid(), - URCU_TLS(nr_enqueues), - URCU_TLS(nr_successful_enqueues), - URCU_TLS(nr_empty_dest_enqueues)); + printf_verbose("enqueuer thread_end, tid %lu, " + "enqueues %llu successful_enqueues %llu, " + "empty_dest_enqueues %llu\n", + urcu_get_thread_id(), + URCU_TLS(nr_enqueues), + URCU_TLS(nr_successful_enqueues), + URCU_TLS(nr_empty_dest_enqueues)); return ((void*)1); } @@ -272,9 +252,8 @@ 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(); @@ -305,14 +284,13 @@ static void *thr_dequeuer(void *_count) loop_sleep(rduration); } - printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " - "dequeues %llu, successful_dequeues %llu " - "pop_all %llu pop_last %llu\n", - (unsigned long) pthread_self(), - (unsigned long) gettid(), - URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues), - URCU_TLS(nr_pop_all), - URCU_TLS(nr_pop_last)); + printf_verbose("dequeuer thread_end, tid %lu, " + "dequeues %llu, successful_dequeues %llu " + "pop_all %llu pop_last %llu\n", + urcu_get_thread_id(), + URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues), + URCU_TLS(nr_pop_all), + URCU_TLS(nr_pop_last)); count[0] = URCU_TLS(nr_dequeues); count[1] = URCU_TLS(nr_successful_dequeues); count[2] = URCU_TLS(nr_pop_all); @@ -471,9 +449,8 @@ int main(int argc, char **argv) printf_verbose("Wait for dequeuers to empty stack.\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);