Skip to content

Commit

Permalink
lib/interval_tree_test.c: allow full tree search
Browse files Browse the repository at this point in the history
...  such that a user can specify visiting all the nodes in the tree
(intersects with the world).  This is a nice opposite from the very
basic default query which is a single point.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Davidlohr Bueso <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Davidlohr Bueso authored and torvalds committed Jul 10, 2017
1 parent a8ec14d commit c46ecce
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions lib/interval_tree_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ __param(int, perf_loops, 100000, "Number of iterations modifying the tree");

__param(int, nsearches, 100, "Number of searches to the interval tree");
__param(int, search_loops, 10000, "Number of iterations searching the tree");
__param(bool, search_all, false, "Searches will iterate all nodes in the tree");

__param(uint, max_endpoint, ~0, "Largest value for the interval's endpoint");

Expand All @@ -25,13 +26,13 @@ static u32 *queries = NULL;
static struct rnd_state rnd;

static inline unsigned long
search(unsigned long query, struct rb_root *root)
search(struct rb_root *root, unsigned long start, unsigned long last)
{
struct interval_tree_node *node;
unsigned long results = 0;

for (node = interval_tree_iter_first(root, query, query); node;
node = interval_tree_iter_next(node, query, query))
for (node = interval_tree_iter_first(root, start, last); node;
node = interval_tree_iter_next(node, start, last))
results++;
return results;
}
Expand Down Expand Up @@ -102,8 +103,12 @@ static int interval_tree_test_init(void)

results = 0;
for (i = 0; i < search_loops; i++)
for (j = 0; j < nsearches; j++)
results += search(queries[j], &root);
for (j = 0; j < nsearches; j++) {
unsigned long start = search_all ? 0 : queries[j];
unsigned long last = search_all ? max_endpoint : queries[j];

results += search(&root, start, last);
}

time2 = get_cycles();
time = time2 - time1;
Expand Down

0 comments on commit c46ecce

Please sign in to comment.