Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c46ecce4 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

lib/interval_tree_test.c: allow full tree search 

...  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/20170518174936.20265-5-dave@stgolabs.net


Signed-off-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8ec14d4

lib/interval_tree_test.c

+10 −5
Original line number Diff line number Diff line
@@ -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");
@@ -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;

}
@@ -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;