MINOR: ebtree: add new eb_next_dup/eb_prev_dup() functions to visit duplicates

Sometimes it's very useful to visit duplicates of a same node, but doing
so from the application is not convenient because keys have to be compared,
while all the information is available during the next/prev steps.

Let's introduce a couple of new eb_next_dup/eb_prev_dup functions to visit
only duplicates of the current node and return NULL once it's done. Now we
have all 3 combinations :
  - next        : returns next node in the tree
  - next_dup    : returns next dup in the sub-tree
  - next_unique : returns next value after skipping dups

(cherry picked from commit 3327b8ae6866f3878322a1a29e70b450226d216d)
This commit is contained in:
Willy Tarreau 2013-05-07 15:58:28 +02:00
parent 2ddccb7ed4
commit 2b5702030d
5 changed files with 109 additions and 0 deletions

View File

@ -74,6 +74,18 @@ static inline struct eb32_node *eb32_prev(struct eb32_node *eb32)
return eb32_entry(eb_prev(&eb32->node), struct eb32_node, node);
}
/* Return next leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb32_node *eb32_next_dup(struct eb32_node *eb32)
{
return eb32_entry(eb_next_dup(&eb32->node), struct eb32_node, node);
}
/* Return previous leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb32_node *eb32_prev_dup(struct eb32_node *eb32)
{
return eb32_entry(eb_prev_dup(&eb32->node), struct eb32_node, node);
}
/* Return next node in the tree, skipping duplicates, or NULL if none */
static inline struct eb32_node *eb32_next_unique(struct eb32_node *eb32)
{

View File

@ -74,6 +74,18 @@ static inline struct eb64_node *eb64_prev(struct eb64_node *eb64)
return eb64_entry(eb_prev(&eb64->node), struct eb64_node, node);
}
/* Return next leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb64_node *eb64_next_dup(struct eb64_node *eb64)
{
return eb64_entry(eb_next_dup(&eb64->node), struct eb64_node, node);
}
/* Return previous leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb64_node *eb64_prev_dup(struct eb64_node *eb64)
{
return eb64_entry(eb_prev_dup(&eb64->node), struct eb64_node, node);
}
/* Return next node in the tree, skipping duplicates, or NULL if none */
static inline struct eb64_node *eb64_next_unique(struct eb64_node *eb64)
{

View File

@ -72,6 +72,18 @@ static forceinline struct ebmb_node *ebmb_prev(struct ebmb_node *ebmb)
return ebmb_entry(eb_prev(&ebmb->node), struct ebmb_node, node);
}
/* Return next leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct ebmb_node *ebmb_next_dup(struct ebmb_node *ebmb)
{
return ebmb_entry(eb_next_dup(&ebmb->node), struct ebmb_node, node);
}
/* Return previous leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct ebmb_node *ebmb_prev_dup(struct ebmb_node *ebmb)
{
return ebmb_entry(eb_prev_dup(&ebmb->node), struct ebmb_node, node);
}
/* Return next node in the tree, skipping duplicates, or NULL if none */
static forceinline struct ebmb_node *ebmb_next_unique(struct ebmb_node *ebmb)
{

View File

@ -80,6 +80,18 @@ static forceinline struct ebpt_node *ebpt_prev(struct ebpt_node *ebpt)
return ebpt_entry(eb_prev(&ebpt->node), struct ebpt_node, node);
}
/* Return next leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct ebpt_node *ebpt_next_dup(struct ebpt_node *ebpt)
{
return ebpt_entry(eb_next_dup(&ebpt->node), struct ebpt_node, node);
}
/* Return previous leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct ebpt_node *ebpt_prev_dup(struct ebpt_node *ebpt)
{
return ebpt_entry(eb_prev_dup(&ebpt->node), struct ebpt_node, node);
}
/* Return next node in the tree, skipping duplicates, or NULL if none */
static forceinline struct ebpt_node *ebpt_next_unique(struct ebpt_node *ebpt)
{

View File

@ -321,6 +321,16 @@ static inline int fls64(unsigned long long x)
#define container_of(ptr, type, name) ((type *)(((void *)(ptr)) - ((long)&((type *)0)->name)))
#endif
/* returns a pointer to the structure of type <type> which has its member <name>
* stored at address <ptr>, unless <ptr> is 0, in which case 0 is returned.
*/
#ifndef container_of_safe
#define container_of_safe(ptr, type, name) \
({ void *__p = (ptr); \
__p ? (type *)(__p - ((long)&((type *)0)->name)) : (type *)0; \
})
#endif
/* Number of bits per node, and number of leaves per node */
#define EB_NODE_BITS 1
#define EB_NODE_BRANCHES (1 << EB_NODE_BITS)
@ -515,6 +525,12 @@ static inline int eb_is_empty(struct eb_root *root)
return !root->b[EB_LEFT];
}
/* Return non-zero if the node is a duplicate, otherwise zero */
static inline int eb_is_dup(struct eb_node *node)
{
return node->bit < 0;
}
/* Return the first leaf in the tree starting at <root>, or NULL if none */
static inline struct eb_node *eb_first(struct eb_root *root)
{
@ -561,6 +577,51 @@ static inline struct eb_node *eb_next(struct eb_node *node)
return eb_walk_down(t, EB_LEFT);
}
/* Return previous leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb_node *eb_prev_dup(struct eb_node *node)
{
eb_troot_t *t = node->leaf_p;
while (eb_gettag(t) == EB_LEFT) {
/* Walking up from left branch. We must ensure that we never
* walk beyond root.
*/
if (unlikely(eb_clrtag((eb_untag(t, EB_LEFT))->b[EB_RGHT]) == NULL))
return NULL;
/* if the current node leaves a dup tree, quit */
if ((eb_root_to_node(eb_untag(t, EB_LEFT)))->bit >= 0)
return NULL;
t = (eb_root_to_node(eb_untag(t, EB_LEFT)))->node_p;
}
/* Note that <t> cannot be NULL at this stage */
if ((eb_root_to_node(eb_untag(t, EB_RGHT)))->bit >= 0)
return NULL;
t = (eb_untag(t, EB_RGHT))->b[EB_LEFT];
return eb_walk_down(t, EB_RGHT);
}
/* Return next leaf node within a duplicate sub-tree, or NULL if none. */
static inline struct eb_node *eb_next_dup(struct eb_node *node)
{
eb_troot_t *t = node->leaf_p;
while (eb_gettag(t) != EB_LEFT) {
/* Walking up from right branch, so we cannot be below root */
/* if the current node leaves a dup tree, quit */
if ((eb_root_to_node(eb_untag(t, EB_RGHT)))->bit >= 0)
return NULL;
t = (eb_root_to_node(eb_untag(t, EB_RGHT)))->node_p;
}
/* Note that <t> cannot be NULL at this stage */
if ((eb_root_to_node(eb_untag(t, EB_LEFT)))->bit >= 0)
return NULL;
t = (eb_untag(t, EB_LEFT))->b[EB_RGHT];
if (eb_clrtag(t) == NULL)
return NULL;
return eb_walk_down(t, EB_LEFT);
}
/* Return previous leaf node before an existing leaf node, skipping duplicates,
* or NULL if none. */
static inline struct eb_node *eb_prev_unique(struct eb_node *node)