X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Frbtree.h;h=3ab9a3347a52edc9b8f61fef4923b8059d62cc47;hb=f22f4e562e1b922cff036ef628b77fd2d479d015;hp=73180d1d54cad93745ba1d3cabb80fd7c00a42ae;hpb=f7cda7a9bc399258959084154263c42c5a91e030;p=vpp.git

diff --git a/src/vppinfra/rbtree.h b/src/vppinfra/rbtree.h
index 73180d1d54c..3ab9a3347a5 100644
--- a/src/vppinfra/rbtree.h
+++ b/src/vppinfra/rbtree.h
@@ -36,7 +36,7 @@ typedef struct rb_node_
   rb_node_index_t left;		/**< left child index */
   rb_node_index_t right;	/**< right child index */
   u32 key;			/**< node key */
-  u32 opaque;			/**< value stored by node */
+  uword opaque;			/**< value stored by node */
 } rb_node_t;
 
 typedef struct rb_tree_
@@ -45,17 +45,26 @@ typedef struct rb_tree_
   rb_node_index_t root;		/**< root index */
 } rb_tree_t;
 
+typedef int (*rb_tree_lt_fn) (u32 a, u32 b);
+
 void rb_tree_init (rb_tree_t * rt);
 rb_node_index_t rb_tree_add (rb_tree_t * rt, u32 key);
-rb_node_index_t rb_tree_add2 (rb_tree_t * rt, u32 key, u32 opaque);
+rb_node_index_t rb_tree_add2 (rb_tree_t * rt, u32 key, uword opaque);
+rb_node_index_t rb_tree_add_custom (rb_tree_t * rt, u32 key, uword opaque,
+				    rb_tree_lt_fn ltfn);
 void rb_tree_del (rb_tree_t * rt, u32 key);
+void rb_tree_del_node (rb_tree_t * rt, rb_node_t * z);
+void rb_tree_del_custom (rb_tree_t * rt, u32 key, rb_tree_lt_fn ltfn);
 void rb_tree_free_nodes (rb_tree_t * rt);
 u32 rb_tree_n_nodes (rb_tree_t * rt);
 rb_node_t *rb_tree_min_subtree (rb_tree_t * rt, rb_node_t * x);
 rb_node_t *rb_tree_max_subtree (rb_tree_t * rt, rb_node_t * x);
 rb_node_t *rb_tree_search_subtree (rb_tree_t * rt, rb_node_t * x, u32 key);
+rb_node_t *rb_tree_search_subtree_custom (rb_tree_t * rt, rb_node_t * x,
+					  u32 key, rb_tree_lt_fn ltfn);
 rb_node_t *rb_tree_successor (rb_tree_t * rt, rb_node_t * x);
 rb_node_t *rb_tree_predecessor (rb_tree_t * rt, rb_node_t * x);
+int rb_tree_is_init (rb_tree_t * rt);
 
 static inline rb_node_index_t
 rb_node_index (rb_tree_t * rt, rb_node_t * n)
@@ -75,6 +84,24 @@ rb_node (rb_tree_t * rt, rb_node_index_t ri)
   return pool_elt_at_index (rt->nodes, ri);
 }
 
+static inline rb_node_t *
+rb_node_right (rb_tree_t * rt, rb_node_t * n)
+{
+  return pool_elt_at_index (rt->nodes, n->right);
+}
+
+static inline rb_node_t *
+rb_node_left (rb_tree_t * rt, rb_node_t * n)
+{
+  return pool_elt_at_index (rt->nodes, n->left);
+}
+
+static inline rb_node_t *
+rb_node_parent (rb_tree_t * rt, rb_node_t * n)
+{
+  return pool_elt_at_index (rt->nodes, n->parent);
+}
+
 #endif /* SRC_VPPINFRA_RBTREE_H_ */
 
 /*