Add range test case, fix range search

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/test_urcu_rbtree.c b/tests/test_urcu_rbtree.c
index c26ac6da8d6f456cf66f222aa6aef5eec1c8c1c7..a5df6ff5b8751111111e923abac42ced80faf7a8 100644 (file)
--- a/tests/test_urcu_rbtree.c
+++ b/tests/test_urcu_rbtree.c
@@ -256,6 +256,27 @@ void *thr_reader(void *_count)
                        assert(!rcu_rbtree_is_nil(node));
                        rcu_read_unlock();
                }
+
+               /* search range min */
+               for (i = 0; i < global_items; i++) {
+                       rcu_read_lock();
+                       node = rcu_rbtree_search_min(&rbtree,
+                                                rcu_dereference(rbtree.root),
+                                                global_key[i], global_key[i]);
+                       assert(!rcu_rbtree_is_nil(node));
+                       rcu_read_unlock();
+               }
+
+               /* search range max */
+               for (i = 0; i < global_items; i++) {
+                       rcu_read_lock();
+                       node = rcu_rbtree_search_max(&rbtree,
+                                                rcu_dereference(rbtree.root),
+                                                global_key[i], global_key[i]);
+                       assert(!rcu_rbtree_is_nil(node));
+                       rcu_read_unlock();
+               }
+
                /* min + next */
                memset(lookup_hit, 0, sizeof(*lookup_hit) * global_items);
 

diff --git a/urcu-rbtree.c b/urcu-rbtree.c
index 5ad7763f91ecdef8236fbe8d71f0d17ecd40c31f..a079d31cd1ff1f59cbd0264f3d66084048b21ad6 100644 (file)
--- a/urcu-rbtree.c
+++ b/urcu-rbtree.c
@@ -384,7 +384,7 @@ struct rcu_rbtree_node *make_nil(struct rcu_rbtree *rbtree)
 /*
  * Iterative rbtree search.
  */
-struct rcu_rbtree_node* rcu_rbtree_search(struct rcu_rbtree *rbtree,
+struct rcu_rbtree_node *rcu_rbtree_search(struct rcu_rbtree *rbtree,
                                          struct rcu_rbtree_node *x,
                                          void *k)
 {
@@ -401,44 +401,70 @@ struct rcu_rbtree_node* rcu_rbtree_search(struct rcu_rbtree *rbtree,
        return x;
 }
 
-struct rcu_rbtree_node* rcu_rbtree_search_min(struct rcu_rbtree *rbtree,
+struct rcu_rbtree_node *rcu_rbtree_search_min(struct rcu_rbtree *rbtree,
                                          struct rcu_rbtree_node *x,
                                          void *range_low, void *range_high)
 {
+       struct rcu_rbtree_node *xl;
        x = rcu_dereference(x);
 
+       dbg_printf("start search min x %lx low %lx high %lx\n",
+               (unsigned long) x->key,
+               (unsigned long) range_low, (unsigned long) range_high);
        while (!rcu_rbtree_is_nil(x)) {
                usleep(10);
-               if (rbtree->comp(x->max_child_key, range_low) > 0) {
-                       x = rcu_dereference(x->_left);
+               xl = rcu_dereference(x->_left);
+               dbg_printf("search min x %lx\n", (unsigned long) x->key);
+               dbg_printf("search min xl %lx\n", (unsigned long) xl->key);
+               if (!rcu_rbtree_is_nil(xl)
+                   && (rbtree->comp(xl->max_child_key, range_low) >= 0
+                       || rbtree->comp(xl->key, range_low) == 0)) {
+                       dbg_printf("go left\n");
+                       x = xl;
                } else if (rbtree->comp(x->key, range_low) >= 0
                           && rbtree->comp(x->key, range_high) <= 0) {
+                       dbg_printf("got it!\n");
                        break;
-               } else if (rbtree->comp(range_low, x->min_child_key) > 0) {
+               } else if (rbtree->comp(range_low, x->min_child_key) >= 0) {
+                       dbg_printf("go right\n");
                        x = rcu_dereference(x->_right);
                } else {
+                       dbg_printf("not found!\n");
                        x = make_nil(rbtree);
                }
        }
        return x;
 }
 
-struct rcu_rbtree_node* rcu_rbtree_search_max(struct rcu_rbtree *rbtree,
+struct rcu_rbtree_node *rcu_rbtree_search_max(struct rcu_rbtree *rbtree,
                                          struct rcu_rbtree_node *x,
                                          void *range_low, void *range_high)
 {
+       struct rcu_rbtree_node *xr;
        x = rcu_dereference(x);
 
+       dbg_printf("start search max x %lx low %lx high %lx\n",
+               (unsigned long) x->key,
+               (unsigned long) range_low, (unsigned long) range_high);
        while (!rcu_rbtree_is_nil(x)) {
                usleep(10);
-               if (rbtree->comp(x->min_child_key, range_high) < 0) {
-                       x = rcu_dereference(x->_right);
+               xr = rcu_dereference(x->_right);
+               dbg_printf("search max x %lx\n", (unsigned long) x->key);
+               dbg_printf("search max xl %lx\n", (unsigned long) xr->key);
+               if (!rcu_rbtree_is_nil(xr)
+                   && (rbtree->comp(xr->min_child_key, range_high) <= 0
+                       || rbtree->comp(xr->key, range_high) == 0)) {
+                       dbg_printf("go right\n");
+                       x = xr;
                } else if (rbtree->comp(x->key, range_low) >= 0
                           && rbtree->comp(x->key, range_high) <= 0) {
+                       dbg_printf("got it!\n");
                        break;
-               } else if (rbtree->comp(range_high, x->max_child_key) < 0) {
+               } else if (rbtree->comp(range_high, x->max_child_key) <= 0) {
+                       dbg_printf("go left\n");
                        x = rcu_dereference(x->_left);
                } else {
+                       dbg_printf("not found!\n");
                        x = make_nil(rbtree);
                }
        }