X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=5659d9a750638f099b3acdbaa05666e0c857571d;hp=aad750a410bcb541c150a985a980f12b346d33b5;hb=a5bae03d59c22e57263b8610b9fed99738303cf0;hpb=111ce0c32c06f79ddcf3c2af3b869a8563106433 diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index aad750a..5659d9a 100644 --- a/tests/test_urcu_lfs.c +++ b/tests/test_urcu_lfs.c @@ -34,34 +34,16 @@ #include #include #include -#include #include #include #include - -#ifdef __linux__ -#include -#endif +#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 @@ -109,12 +91,6 @@ 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 @@ -177,12 +153,12 @@ struct test { static struct cds_lfs_stack s; -void *thr_enqueuer(void *_count) +static 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(); @@ -213,10 +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); } @@ -275,12 +252,13 @@ void do_test_pop_all(enum test_sync sync) } -void *thr_dequeuer(void *_count) +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", pthread_self(), (unsigned long)gettid()); + printf_verbose("thread_begin %s, tid %lu\n", + "dequeuer", urcu_get_thread_id()); set_affinity(); @@ -294,8 +272,6 @@ 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) @@ -318,16 +294,17 @@ 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); } -void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) +static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) { struct cds_lfs_node *snode; @@ -343,17 +320,19 @@ void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) } while (snode); } -void show_usage(int argc, char **argv) +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) \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"); } @@ -446,15 +425,19 @@ int main(int argc, char **argv) printf_verbose("pop test activated.\n"); if (test_pop_all) printf_verbose("pop_all test activated.\n"); + if (test_sync == TEST_SYNC_RCU) + printf_verbose("External sync: RCU.\n"); + else + 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", 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_lfs_init(&s); err = create_all_cpu_call_rcu_data(0); if (err) {