From 472d3f7cc1d5b0eae0a710a66a4a646e94ce306a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 8 Mar 2010 18:09:13 -0500 Subject: [PATCH] Basic fix for rbtree nil root and urcu defer registration Signed-off-by: Mathieu Desnoyers --- tests/test_urcu_rbtree.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/tests/test_urcu_rbtree.c b/tests/test_urcu_rbtree.c index d42279b..043ec71 100644 --- a/tests/test_urcu_rbtree.c +++ b/tests/test_urcu_rbtree.c @@ -34,6 +34,7 @@ #include #include #include +#include #include @@ -62,8 +63,9 @@ static inline pid_t gettid(void) #endif #include #include +#include -static struct rcu_rbtree_node *rbtree_root; +static struct rcu_rbtree_node *rbtree_root = &rcu_rbtree_nil; /* TODO: error handling testing for -ENOMEM */ struct rcu_rbtree_node *rbtree_alloc(void) @@ -71,9 +73,19 @@ struct rcu_rbtree_node *rbtree_alloc(void) return malloc(sizeof(struct rcu_rbtree_node)); } -struct rcu_rbtree_node *rbtree_free(struct rcu_rbtree_node *node) +void rbtree_free(struct rcu_rbtree_node *node) { - return free(node); + free(node); +} + +int tree_comp(void *a, void *b) +{ + if ((unsigned long)a < (unsigned long)b) + return -1; + else if ((unsigned long)a > (unsigned long)b) + return 1; + else + return 0; } static volatile int test_go, test_stop; @@ -232,22 +244,30 @@ void *thr_reader(void *_count) void *thr_writer(void *_count) { unsigned long long *count = _count; + struct rcu_rbtree_node *node; printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); set_affinity(); + rcu_defer_register_thread(); + while (!test_go) { } smp_mb(); for (;;) { - + node = rbtree_alloc(); + rcu_copy_mutex_lock(); + node->key = (void *)(unsigned long)(rand() % 2048); + rcu_rbtree_insert(&rbtree_root, node, tree_comp, rbtree_alloc, + rbtree_free); if (unlikely(wduration)) loop_sleep(wduration); + rcu_copy_mutex_unlock(); nr_writes++; if (unlikely(!test_duration_write())) break; @@ -255,6 +275,8 @@ void *thr_writer(void *_count) loop_sleep(wdelay); } + rcu_defer_unregister_thread(); + printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); *count = nr_writes; @@ -368,6 +390,8 @@ int main(int argc, char **argv) count_reader = malloc(sizeof(*count_reader) * nr_readers); count_writer = malloc(sizeof(*count_writer) * nr_writers); + srand(time(NULL)); + next_aff = 0; for (i = 0; i < nr_readers; i++) { -- 2.34.1