X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_wfq.c;h=382a1f6f38abb54926b1d0d0a563ca6564999f01;hp=83ec6359f2c40710dc9ceb05ef2f39cbbb45868c;hb=9aa14175d93952464fa8ec15df54e2656c349c0b;hpb=cc6b0c208a9707f8a64609a51167290caeace288 diff --git a/tests/test_urcu_wfq.c b/tests/test_urcu_wfq.c index 83ec635..382a1f6 100644 --- a/tests/test_urcu_wfq.c +++ b/tests/test_urcu_wfq.c @@ -34,36 +34,23 @@ #include #include #include -#include #include #include - -#ifdef __linux__ -#include -#endif +#include +#include "cpuset.h" +#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 + +/* Remove deprecation warnings from test build. */ +#define CDS_WFQ_DEPRECATED + #include #include @@ -76,9 +63,9 @@ static unsigned long duration; /* read-side C.S. duration, in loops */ static unsigned long wdelay; -static inline void loop_sleep(unsigned long l) +static inline void loop_sleep(unsigned long loops) { - while(l-- != 0) + while (loops-- != 0) caa_cpu_relax(); } @@ -96,17 +83,12 @@ static int use_affinity = 0; pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER; -#ifndef HAVE_CPU_SET_T -typedef unsigned long cpu_set_t; -# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0) -# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0) -#endif - static void set_affinity(void) { +#if HAVE_SCHED_SETAFFINITY cpu_set_t mask; - int cpu; - int ret; + int cpu, ret; +#endif /* HAVE_SCHED_SETAFFINITY */ if (!use_affinity) return; @@ -147,11 +129,11 @@ static int test_duration_enqueue(void) return !test_stop; } -static unsigned long long __thread nr_dequeues; -static unsigned long long __thread nr_enqueues; +static DEFINE_URCU_TLS(unsigned long long, nr_dequeues); +static DEFINE_URCU_TLS(unsigned long long, nr_enqueues); -static unsigned long long __thread nr_successful_dequeues; -static unsigned long long __thread nr_successful_enqueues; +static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues); +static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues); static unsigned int nr_enqueuers; static unsigned int nr_dequeuers; @@ -162,8 +144,8 @@ void *thr_enqueuer(void *_count) { unsigned long long *count = _count; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "enqueuer", pthread_self(), (unsigned long)gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "enqueuer", urcu_get_thread_id()); set_affinity(); @@ -178,22 +160,23 @@ void *thr_enqueuer(void *_count) goto fail; cds_wfq_node_init(node); cds_wfq_enqueue(&q, node); - nr_successful_enqueues++; + URCU_TLS(nr_successful_enqueues)++; if (caa_unlikely(wdelay)) loop_sleep(wdelay); fail: - nr_enqueues++; + URCU_TLS(nr_enqueues)++; if (caa_unlikely(!test_duration_enqueue())) break; } - count[0] = nr_enqueues; - count[1] = nr_successful_enqueues; - printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, " - "enqueues %llu successful_enqueues %llu\n", - pthread_self(), (unsigned long)gettid(), nr_enqueues, - nr_successful_enqueues); + count[0] = URCU_TLS(nr_enqueues); + count[1] = 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); } @@ -202,8 +185,8 @@ void *thr_dequeuer(void *_count) { unsigned long long *count = _count; - printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "dequeuer", pthread_self(), (unsigned long)gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "dequeuer", urcu_get_thread_id()); set_affinity(); @@ -217,22 +200,23 @@ void *thr_dequeuer(void *_count) if (node) { free(node); - nr_successful_dequeues++; + URCU_TLS(nr_successful_dequeues)++; } - nr_dequeues++; + URCU_TLS(nr_dequeues)++; if (caa_unlikely(!test_duration_dequeue())) break; if (caa_unlikely(rduration)) loop_sleep(rduration); } - printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " - "dequeues %llu, successful_dequeues %llu\n", - pthread_self(), (unsigned long)gettid(), nr_dequeues, - nr_successful_dequeues); - count[0] = nr_dequeues; - count[1] = 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); } @@ -251,11 +235,13 @@ void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues) 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("Usage : %s nr_dequeuers nr_enqueuers duration (s) \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("\n"); } @@ -333,13 +319,13 @@ 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", 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); - count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers); - count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers); + tid_enqueuer = calloc(nr_enqueuers, sizeof(*tid_enqueuer)); + tid_dequeuer = calloc(nr_dequeuers, sizeof(*tid_dequeuer)); + count_enqueuer = calloc(nr_enqueuers, 2 * sizeof(*count_enqueuer)); + count_dequeuer = calloc(nr_dequeuers, 2 * sizeof(*count_dequeuer)); cds_wfq_init(&q); next_aff = 0;