X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=28e3e0678cf0b4b163786b97bb024d8a8d42c9ce;hp=b48a35fe0f1c77ebaf9806cc03422ce8567e74ba;hb=372b9ad7acc40810bbcec6a796c71b54901b3ca7;hpb=8bcbd94a60f624c1faae1481fcb0888aec25b481 diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index b48a35f..28e3e06 100644 --- a/tests/test_urcu_lfs.c +++ b/tests/test_urcu_lfs.c @@ -1,9 +1,9 @@ /* * test_urcu_lfs.c * - * Userspace RCU library - example RCU-based lock-free stack + * Userspace RCU library - example lock-free stack * - * Copyright February 2010 - Mathieu Desnoyers + * Copyright 2010-2012 - Mathieu Desnoyers * Copyright February 2010 - Paolo Bonzini * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,7 @@ #include #include +#include #ifdef __linux__ #include @@ -66,7 +67,16 @@ static inline pid_t gettid(void) #endif #include #include -#include + +/* + * External synchronization used. + */ +enum test_sync { + TEST_SYNC_NONE = 0, + TEST_SYNC_RCU, +}; + +static enum test_sync test_sync; static volatile int test_go, test_stop; @@ -77,18 +87,20 @@ 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(); } static int verbose_mode; +static int test_pop, test_pop_all; + #define printf_verbose(fmt, args...) \ do { \ if (verbose_mode) \ - printf(fmt, args); \ + printf(fmt, ## args); \ } while (0) static unsigned int cpu_affinities[NR_CPUS]; @@ -105,9 +117,10 @@ typedef unsigned long cpu_set_t; 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; @@ -148,28 +161,29 @@ 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; struct test { - struct cds_lfs_node_rcu list; + struct cds_lfs_node list; struct rcu_head rcu; }; -static struct cds_lfs_stack_rcu s; +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()); + "enqueuer", (unsigned long) pthread_self(), + (unsigned long) gettid()); set_affinity(); @@ -184,27 +198,27 @@ void *thr_enqueuer(void *_count) struct test *node = malloc(sizeof(*node)); if (!node) goto fail; - cds_lfs_node_init_rcu(&node->list); - /* No rcu read-side is needed for push */ - cds_lfs_push_rcu(&s, &node->list); - nr_successful_enqueues++; + cds_lfs_node_init(&node->list); + cds_lfs_push(&s, &node->list); + 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; } rcu_unregister_thread(); - count[0] = nr_enqueues; - count[1] = nr_successful_enqueues; + 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(), nr_enqueues, - nr_successful_enqueues); + pthread_self(), + (unsigned long) gettid(), + URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues)); return ((void*)1); } @@ -217,21 +231,62 @@ void free_node_cb(struct rcu_head *head) free(node); } -void *thr_dequeuer(void *_count) +static +void do_test_pop(enum test_sync sync) +{ + struct cds_lfs_node *snode; + + if (sync == TEST_SYNC_RCU) + rcu_read_lock(); + snode = __cds_lfs_pop(&s); + if (sync == TEST_SYNC_RCU) + rcu_read_unlock(); + if (snode) { + struct test *node; + + node = caa_container_of(snode, + struct test, list); + if (sync == TEST_SYNC_RCU) + call_rcu(&node->rcu, free_node_cb); + else + free(node); + URCU_TLS(nr_successful_dequeues)++; + } + URCU_TLS(nr_dequeues)++; +} + +static +void do_test_pop_all(enum test_sync sync) +{ + struct cds_lfs_node *snode; + struct cds_lfs_head *head; + struct cds_lfs_node *n; + + head = __cds_lfs_pop_all(&s); + cds_lfs_for_each_safe(head, snode, n) { + struct test *node; + + node = caa_container_of(snode, struct test, list); + if (sync == TEST_SYNC_RCU) + call_rcu(&node->rcu, free_node_cb); + else + free(node); + URCU_TLS(nr_successful_dequeues)++; + URCU_TLS(nr_dequeues)++; + } + +} + +static void *thr_dequeuer(void *_count) { unsigned long long *count = _count; - int ret; printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "dequeuer", pthread_self(), (unsigned long)gettid()); + "dequeuer", (unsigned long) pthread_self(), + (unsigned long) gettid()); set_affinity(); - ret = rcu_defer_register_thread(); - if (ret) { - printf("Error in rcu_defer_register_thread\n"); - exit(-1); - } rcu_register_thread(); while (!test_go) @@ -239,19 +294,25 @@ void *thr_dequeuer(void *_count) } cmm_smp_mb(); - for (;;) { - struct cds_lfs_node_rcu *snode; - struct test *node; + assert(test_pop || test_pop_all); - rcu_read_lock(); - snode = cds_lfs_pop_rcu(&s); - node = caa_container_of(snode, struct test, list); - rcu_read_unlock(); - if (node) { - call_rcu(&node->rcu, free_node_cb); - nr_successful_dequeues++; + for (;;) { + unsigned int counter = 0; + + if (test_pop && test_pop_all) { + /* both pop and pop all */ + if (counter & 1) + do_test_pop(test_sync); + else + do_test_pop_all(test_sync); + counter++; + } else { + if (test_pop) + do_test_pop(test_sync); + else + do_test_pop_all(test_sync); } - nr_dequeues++; + if (caa_unlikely(!test_duration_dequeue())) break; if (caa_unlikely(rduration)) @@ -259,23 +320,23 @@ void *thr_dequeuer(void *_count) } rcu_unregister_thread(); - rcu_defer_unregister_thread(); 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; + pthread_self(), + (unsigned long) gettid(), + 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_rcu *s, unsigned long long *nr_dequeues) +static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) { - struct cds_lfs_node_rcu *snode; + struct cds_lfs_node *snode; do { - snode = cds_lfs_pop_rcu(s); + snode = __cds_lfs_pop(s); if (snode) { struct test *node; @@ -286,13 +347,17 @@ void test_end(struct cds_lfs_stack_rcu *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("\n"); } @@ -362,22 +427,44 @@ int main(int argc, char **argv) case 'v': verbose_mode = 1; break; + case 'p': + test_pop = 1; + break; + case 'P': + test_pop_all = 1; + break; + case 'R': + test_sync = TEST_SYNC_RCU; + break; } } + /* activate pop_all test by default */ + if (!test_pop && !test_pop_all) + test_pop_all = 1; + printf_verbose("running test for %lu seconds, %u enqueuers, " "%u dequeuers.\n", duration, nr_enqueuers, nr_dequeuers); + if (test_pop) + 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()); + "main", (unsigned long) pthread_self(), + (unsigned long) gettid()); 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); - cds_lfs_init_rcu(&s); + cds_lfs_init(&s); err = create_all_cpu_call_rcu_data(0); if (err) { printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");