9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ircd: radixtree: add irc_radixtree_foreach_start_from() which uses irc_radixtree_elem_find() to find the starting point

Browse source
This commit is contained in:
William Pitcock 2016-01-20 21:02:03 -05:00
parent 1b68574301
commit 0d9a72de21
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/irc_radixtree.h
View file

@ -55,6 +55,9 @@ struct irc_radixtree_iteration_state
#define IRC_RADIXTREE_FOREACH(element, state, dict) \ #define IRC_RADIXTREE_FOREACH(element, state, dict) \
for (irc_radixtree_foreach_start((dict), (state)); (element = irc_radixtree_foreach_cur((dict), (state))); irc_radixtree_foreach_next((dict), (state))) for (irc_radixtree_foreach_start((dict), (state)); (element = irc_radixtree_foreach_cur((dict), (state))); irc_radixtree_foreach_next((dict), (state)))
#define IRC_RADIXTREE_FOREACH_FROM(element, state, dict, key) \
for (irc_radixtree_foreach_start_from((dict), (state), (key)); (element = irc_radixtree_foreach_cur((dict), (state))); irc_radixtree_foreach_next((dict), (state)))
/* /*
* irc_radixtree_create() creates a new patricia tree of the defined resolution. * irc_radixtree_create() creates a new patricia tree of the defined resolution.
* compare_cb is the canonizing function. * compare_cb is the canonizing function.
@ -100,6 +103,15 @@ extern void *irc_radixtree_search(struct irc_radixtree *dtree, void *(*foreach_c
*/ */
extern void irc_radixtree_foreach_start(struct irc_radixtree *dtree, struct irc_radixtree_iteration_state *state); extern void irc_radixtree_foreach_start(struct irc_radixtree *dtree, struct irc_radixtree_iteration_state *state);
/*
* irc_radixtree_foreach_start_from() begins an iteration over all items,
* starting with the item specified by `key`. If there is only one iteration
* in progress at a time, it is permitted to remove the current element
* of the iteration (but not any other element).
* Use NULL as a key to have it start at the beginning.
*/
extern void irc_radixtree_foreach_start_from(struct irc_radixtree *dtree, struct irc_radixtree_iteration_state *state, const char *key);
/* /*
* irc_radixtree_foreach_cur() returns the current element of the iteration, * irc_radixtree_foreach_cur() returns the current element of the iteration,
* or NULL if there are no more elements. * or NULL if there are no more elements.

35
ircd/irc_radixtree.c
View file

@ -609,6 +609,41 @@ irc_radixtree_elem_find(struct irc_radixtree *dict, const char *key)
return &delem->leaf; return &delem->leaf;
} }
/*
* irc_radixtree_foreach_start_from(struct irc_radixtree *dtree, struct irc_radixtree_iteration_state *state, const char *key)
*
* Starts iteration from a specified key, by wrapping irc_radixtree_elem_find().
*
* Inputs:
* - patricia tree object
* - iterator
* - key to start from
*
* Outputs:
* - none
*
* Side Effects:
* - the iterator's state is initialized at a specific point
*/
void
irc_radixtree_foreach_start_from(struct irc_radixtree *dtree, struct irc_radixtree_iteration_state *state, const char *key)
{
s_assert(dtree != NULL);
s_assert(state != NULL);
if (key != NULL)
{
STATE_CUR(state) = NULL;
STATE_NEXT(state) = irc_radixtree_elem_find(dtree, key);
/* make STATE_CUR point to selected item and STATE_NEXT point to
* next item in the tree */
irc_radixtree_foreach_next(dtree, state);
}
else
irc_radixtree_foreach_start(dtree, state);
}
/* /*
* irc_radixtree_add(struct irc_radixtree *dtree, const char *key, void *data) * irc_radixtree_add(struct irc_radixtree *dtree, const char *key, void *data)
* *