From 94aec12284c03da90d879b4d55280f9cbf0e183a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 4 Sep 2011 21:25:21 -0400 Subject: [PATCH] lfq/lfs tests: use call_rcu Signed-off-by: Mathieu Desnoyers --- tests/Makefile.am | 4 ++-- tests/test_urcu_lfq.c | 42 ++++++++++++++++++++++++++++++------------ tests/test_urcu_lfs.c | 40 ++++++++++++++++++++++++++++++---------- 3 files changed, 62 insertions(+), 24 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 399fe9c..9f5fbb1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -165,8 +165,8 @@ test_urcu_wfq_dynlink_SOURCES = test_urcu_wfq.c test_urcu_wfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_wfq_dynlink_LDADD = $(URCU_COMMON_LIB) -test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_CDS_LIB) $(URCU_DEFER) -test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU_DEFER) +test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU) $(URCU_CDS_LIB) +test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU) test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB) diff --git a/tests/test_urcu_lfq.c b/tests/test_urcu_lfq.c index b61a7d4..2d701f2 100644 --- a/tests/test_urcu_lfq.c +++ b/tests/test_urcu_lfq.c @@ -157,6 +157,11 @@ static unsigned long long __thread nr_successful_enqueues; static unsigned int nr_enqueuers; static unsigned int nr_dequeuers; +struct test { + struct cds_lfq_node_rcu list; + struct rcu_head rcu; +}; + static struct cds_lfq_queue_rcu q; void *thr_enqueuer(void *_count) @@ -176,12 +181,12 @@ void *thr_enqueuer(void *_count) cmm_smp_mb(); for (;;) { - struct cds_lfq_node_rcu *node = malloc(sizeof(*node)); + struct test *node = malloc(sizeof(*node)); if (!node) goto fail; - cds_lfq_node_init_rcu(node); + cds_lfq_node_init_rcu(&node->list); rcu_read_lock(); - cds_lfq_enqueue_rcu(&q, node); + cds_lfq_enqueue_rcu(&q, &node->list); rcu_read_unlock(); nr_successful_enqueues++; @@ -205,6 +210,14 @@ fail: } +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; @@ -228,14 +241,16 @@ void *thr_dequeuer(void *_count) cmm_smp_mb(); for (;;) { - struct cds_lfq_node_rcu *node; + struct cds_lfq_node_rcu *qnode; + struct test *node; rcu_read_lock(); - node = cds_lfq_dequeue_rcu(&q); + qnode = cds_lfq_dequeue_rcu(&q); + node = caa_container_of(qnode, struct test, list); rcu_read_unlock(); if (node) { - defer_rcu(free, node); + call_rcu(&node->rcu, free_node_cb); nr_successful_dequeues++; } @@ -259,17 +274,18 @@ void *thr_dequeuer(void *_count) void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues) { - struct cds_lfq_node_rcu *node; + struct cds_lfq_node_rcu *snode; do { - rcu_read_lock(); - node = cds_lfq_dequeue_rcu(q); - rcu_read_unlock(); - if (node) { + snode = cds_lfq_dequeue_rcu(q); + if (snode) { + struct test *node; + + node = caa_container_of(snode, struct test, list); free(node); /* no more concurrent access */ (*nr_dequeues)++; } - } while (node); + } while (snode); } void show_usage(int argc, char **argv) @@ -364,6 +380,8 @@ int main(int argc, char **argv) count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers); count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers); cds_lfq_init_rcu(&q, call_rcu); + err = create_all_cpu_call_rcu_data(0); + assert(!err); next_aff = 0; diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c index 252454d..e02fa58 100644 --- a/tests/test_urcu_lfs.c +++ b/tests/test_urcu_lfs.c @@ -157,6 +157,11 @@ static unsigned long long __thread nr_successful_enqueues; static unsigned int nr_enqueuers; static unsigned int nr_dequeuers; +struct test { + struct cds_lfs_node_rcu list; + struct rcu_head rcu; +}; + static struct cds_lfs_stack_rcu s; void *thr_enqueuer(void *_count) @@ -176,12 +181,12 @@ void *thr_enqueuer(void *_count) cmm_smp_mb(); for (;;) { - struct cds_lfs_node_rcu *node = malloc(sizeof(*node)); + struct test *node = malloc(sizeof(*node)); if (!node) goto fail; - cds_lfs_node_init_rcu(node); + cds_lfs_node_init_rcu(&node->list); /* No rcu read-side is needed for push */ - cds_lfs_push_rcu(&s, node); + cds_lfs_push_rcu(&s, &node->list); nr_successful_enqueues++; if (unlikely(wdelay)) @@ -204,6 +209,14 @@ fail: } +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; @@ -227,13 +240,15 @@ void *thr_dequeuer(void *_count) cmm_smp_mb(); for (;;) { - struct cds_lfs_node_rcu *node; + struct cds_lfs_node_rcu *snode; + struct test *node; rcu_read_lock(); - node = cds_lfs_pop_rcu(&s); + snode = cds_lfs_pop_rcu(&s); + node = caa_container_of(snode, struct test, list); rcu_read_unlock(); if (node) { - defer_rcu(free, node); + call_rcu(&node->rcu, free_node_cb); nr_successful_dequeues++; } nr_dequeues++; @@ -257,15 +272,18 @@ void *thr_dequeuer(void *_count) void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues) { - struct cds_lfs_node_rcu *node; + struct cds_lfs_node_rcu *snode; do { - node = cds_lfs_pop_rcu(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) @@ -360,6 +378,8 @@ int main(int argc, char **argv) count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers); count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers); cds_lfs_init_rcu(&s); + err = create_all_cpu_call_rcu_data(0); + assert(!err); next_aff = 0; -- 2.34.1