X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Frbtree.c;h=b8ee6f6c43d38f12b51877da5b37ba1d3edc5507;hb=980ee74b165a4fa629f868935c446773ca82372e;hp=ff86b0f1b5b958ce65130c86dc66d51b436792a7;hpb=d314963d0f1d12c45c55c7fd210f93c5cac3a8fc;p=vpp.git

diff --git a/src/vppinfra/rbtree.c b/src/vppinfra/rbtree.c
index ff86b0f1b5b..b8ee6f6c43d 100644
--- a/src/vppinfra/rbtree.c
+++ b/src/vppinfra/rbtree.c
@@ -166,7 +166,7 @@ rb_tree_insert (rb_tree_t * rt, rb_node_t * z)
   rb_tree_fixup_inline (rt, y, z);
 }
 
-rb_node_index_t
+__clib_export rb_node_index_t
 rb_tree_add (rb_tree_t * rt, u32 key)
 {
   rb_node_t *n;
@@ -178,7 +178,7 @@ rb_tree_add (rb_tree_t * rt, u32 key)
   return rb_node_index (rt, n);
 }
 
-rb_node_index_t
+__clib_export rb_node_index_t
 rb_tree_add2 (rb_tree_t * rt, u32 key, uword opaque)
 {
   rb_node_t *n;
@@ -191,7 +191,7 @@ rb_tree_add2 (rb_tree_t * rt, u32 key, uword opaque)
   return rb_node_index (rt, n);
 }
 
-rb_node_index_t
+__clib_export rb_node_index_t
 rb_tree_add_custom (rb_tree_t * rt, u32 key, uword opaque, rb_tree_lt_fn ltfn)
 {
   rb_node_index_t yi = 0, xi = rt->root;
@@ -207,6 +207,7 @@ rb_tree_add_custom (rb_tree_t * rt, u32 key, uword opaque, rb_tree_lt_fn ltfn)
     {
       x = rb_node (rt, xi);
       y = x;
+      ASSERT (z->key != x->key);
       if (ltfn (z->key, x->key))
 	xi = x->left;
       else
@@ -226,7 +227,7 @@ rb_tree_add_custom (rb_tree_t * rt, u32 key, uword opaque, rb_tree_lt_fn ltfn)
   return rb_node_index (rt, z);
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_search_subtree (rb_tree_t * rt, rb_node_t * x, u32 key)
 {
   while (rb_node_index (rt, x) != RBTREE_TNIL_INDEX && key != x->key)
@@ -237,7 +238,7 @@ rb_tree_search_subtree (rb_tree_t * rt, rb_node_t * x, u32 key)
   return x;
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_search_subtree_custom (rb_tree_t * rt, rb_node_t * x, u32 key,
 			       rb_tree_lt_fn ltfn)
 {
@@ -249,7 +250,7 @@ rb_tree_search_subtree_custom (rb_tree_t * rt, rb_node_t * x, u32 key,
   return x;
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_min_subtree (rb_tree_t * rt, rb_node_t * x)
 {
   while (x->left != RBTREE_TNIL_INDEX)
@@ -257,7 +258,7 @@ rb_tree_min_subtree (rb_tree_t * rt, rb_node_t * x)
   return x;
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_max_subtree (rb_tree_t * rt, rb_node_t * x)
 {
   while (x->right != RBTREE_TNIL_INDEX)
@@ -265,7 +266,7 @@ rb_tree_max_subtree (rb_tree_t * rt, rb_node_t * x)
   return x;
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_successor (rb_tree_t * rt, rb_node_t * x)
 {
   rb_node_t *y;
@@ -282,7 +283,7 @@ rb_tree_successor (rb_tree_t * rt, rb_node_t * x)
   return y;
 }
 
-rb_node_t *
+__clib_export rb_node_t *
 rb_tree_predecessor (rb_tree_t * rt, rb_node_t * x)
 {
   rb_node_t *y;
@@ -314,8 +315,8 @@ rb_tree_transplant (rb_tree_t * rt, rb_node_t * u, rb_node_t * v)
   v->parent = u->parent;
 }
 
-void
-rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
+static void
+rb_tree_del_node_internal (rb_tree_t * rt, rb_node_t * z)
 {
   rb_node_color_t y_original_color;
   rb_node_t *x, *y, *yr, *yl, *xp, *w, *wl, *wr;
@@ -440,44 +441,45 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
   x->color = RBTREE_BLACK;
 }
 
-void
+__clib_export void
+rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
+{
+  rb_tree_del_node_internal (rt, z);
+  pool_put (rt->nodes, z);
+}
+
+__clib_export void
 rb_tree_del (rb_tree_t * rt, u32 key)
 {
   rb_node_t *n;
   n = rb_tree_search_subtree (rt, rb_node (rt, rt->root), key);
   if (rb_node_index (rt, n) != RBTREE_TNIL_INDEX)
-    {
-      rb_tree_del_node (rt, n);
-      pool_put (rt->nodes, n);
-    }
+    rb_tree_del_node (rt, n);
 }
 
-void
+__clib_export void
 rb_tree_del_custom (rb_tree_t * rt, u32 key, rb_tree_lt_fn ltfn)
 {
   rb_node_t *n;
   n = rb_tree_search_subtree_custom (rt, rb_node (rt, rt->root), key, ltfn);
   if (rb_node_index (rt, n) != RBTREE_TNIL_INDEX)
-    {
-      rb_tree_del_node (rt, n);
-      pool_put (rt->nodes, n);
-    }
+    rb_tree_del_node (rt, n);
 }
 
-u32
+__clib_export u32
 rb_tree_n_nodes (rb_tree_t * rt)
 {
   return pool_elts (rt->nodes);
 }
 
-void
+__clib_export void
 rb_tree_free_nodes (rb_tree_t * rt)
 {
   pool_free (rt->nodes);
   rt->root = RBTREE_TNIL_INDEX;
 }
 
-void
+__clib_export void
 rb_tree_init (rb_tree_t * rt)
 {
   rb_node_t *tnil;
@@ -490,6 +492,14 @@ rb_tree_init (rb_tree_t * rt)
   tnil->color = RBTREE_BLACK;
 }
 
+__clib_export int
+rb_tree_is_init (rb_tree_t * rt)
+{
+  if (pool_elts (rt->nodes) == 0)
+    return 0;
+  return 1;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *