X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=ec0fa13988d6f6525af33bc2dc6b0cf534710899;hp=c85fa447c37afd7eb48da32f1c10811e57fd9d85;hb=7294103b4caaa3487a362ae9925faa7f6821e0b3;hpb=bce63dfd0a2306452c9e39f5df01789e77f3f44a diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index c85fa44..ec0fa13 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,6 @@ static inline pid_t gettid(void) #endif #include #include -#include static volatile int test_go, test_stop; @@ -77,9 +77,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(); } @@ -105,9 +105,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,21 +149,21 @@ 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) { @@ -184,27 +185,26 @@ 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 (unlikely(wdelay)) + if (caa_unlikely(wdelay)) loop_sleep(wdelay); fail: - nr_enqueues++; - if (unlikely(!test_duration_enqueue())) + 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); } @@ -220,18 +220,12 @@ void free_node_cb(struct rcu_head *head) 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()); 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) @@ -240,42 +234,42 @@ void *thr_dequeuer(void *_count) cmm_smp_mb(); for (;;) { - struct cds_lfs_node_rcu *snode; - struct test *node; + struct cds_lfs_node *snode; rcu_read_lock(); - snode = cds_lfs_pop_rcu(&s); - node = caa_container_of(snode, struct test, list); + snode = __cds_lfs_pop(&s); rcu_read_unlock(); - if (node) { + if (snode) { + struct test *node; + + node = caa_container_of(snode, struct test, list); call_rcu(&node->rcu, free_node_cb); - nr_successful_dequeues++; + URCU_TLS(nr_successful_dequeues)++; } - nr_dequeues++; - if (unlikely(!test_duration_dequeue())) + URCU_TLS(nr_dequeues)++; + if (caa_unlikely(!test_duration_dequeue())) break; - if (unlikely(rduration)) + if (caa_unlikely(rduration)) loop_sleep(rduration); } 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) +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; @@ -377,9 +371,11 @@ int main(int argc, char **argv) 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); - assert(!err); + if (err) { + printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n"); + } next_aff = 0;