X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=5886ce86de50c1ab2c25c61a172d895fa4a33a53;hp=8249ebaeb05295cb43435cf3869a6ebfc74d9457;hb=ab0aacbe1a25d50d069f0b24aa492e84ea296f57;hpb=5481ddb381061bda64aebc039900d21cac6a6caf diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index 8249eba..5886ce8 100644 --- a/tests/test_urcu_lfs.c +++ b/tests/test_urcu_lfs.c @@ -34,11 +34,15 @@ #include #include #include -#include #include #include #include +#include + +#ifdef __linux__ +#include +#endif /* hardcoded number of CPUs */ #define NR_CPUS 16384 @@ -62,7 +66,7 @@ static inline pid_t gettid(void) #define _LGPL_SOURCE #endif #include -#include +#include #include static volatile int test_go, test_stop; @@ -74,10 +78,10 @@ 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) - cpu_relax(); + while (loops-- != 0) + caa_cpu_relax(); } static int verbose_mode; @@ -145,16 +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; -static struct rcu_lfs_stack s; +struct test { + struct cds_lfs_node_rcu list; + struct rcu_head rcu; +}; + +static struct cds_lfs_stack_rcu s; void *thr_enqueuer(void *_count) { @@ -173,43 +182,57 @@ void *thr_enqueuer(void *_count) cmm_smp_mb(); for (;;) { - struct rcu_lfs_node *node = malloc(sizeof(*node)); + struct test *node = malloc(sizeof(*node)); if (!node) goto fail; - rcu_lfs_node_init(node); - rcu_lfs_push(&s, node); - nr_successful_enqueues++; + cds_lfs_node_init_rcu(&node->list); + /* No rcu read-side is needed for push */ + cds_lfs_push_rcu(&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); } +static +void free_node_cb(struct rcu_head *head) +{ + struct test *node = + caa_container_of(head, struct test, rcu); + free(node); +} + 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(); - rcu_defer_register_thread(); + ret = rcu_defer_register_thread(); + if (ret) { + printf("Error in rcu_defer_register_thread\n"); + exit(-1); + } rcu_register_thread(); while (!test_go) @@ -218,17 +241,21 @@ void *thr_dequeuer(void *_count) cmm_smp_mb(); for (;;) { - struct rcu_lfs_node *node = rcu_lfs_pop(&s); + struct cds_lfs_node_rcu *snode; + struct test *node; + rcu_read_lock(); + snode = cds_lfs_pop_rcu(&s); + node = caa_container_of(snode, struct test, list); + rcu_read_unlock(); if (node) { - defer_rcu(free, node); - nr_successful_dequeues++; + call_rcu(&node->rcu, free_node_cb); + 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); } @@ -237,24 +264,27 @@ void *thr_dequeuer(void *_count) 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 rcu_lfs_stack *s, unsigned long long *nr_dequeues) +void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues) { - struct rcu_lfs_node *node; + struct cds_lfs_node_rcu *snode; do { - node = rcu_lfs_pop(s); - if (node) { + snode = cds_lfs_pop_rcu(s); + if (snode) { + struct test *node; + + node = caa_container_of(snode, struct test, list); free(node); (*nr_dequeues)++; } - } while (node); + } while (snode); } void show_usage(int argc, char **argv) @@ -348,7 +378,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); - rcu_lfs_init(&s); + cds_lfs_init_rcu(&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"); + } next_aff = 0; @@ -415,6 +449,7 @@ int main(int argc, char **argv) tot_successful_enqueues, tot_successful_dequeues + end_dequeues); + free_all_cpu_call_rcu_data(); free(count_enqueuer); free(count_dequeuer); free(tid_enqueuer);