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

Commit c00b060f authored by Jiri Olsa's avatar Jiri Olsa Committed by Steven Rostedt
Browse files

tracing/filter: Change count_leafs function to use walk_pred_tree 



Changing count_leafs function to use unified predicates tree
processing.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1313072754-4620-7-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f03f5979

kernel/trace/trace_events_filter.c

+14 −33
Original line number Original line Diff line number Diff line
@@ -1418,43 +1418,24 @@ static int check_pred_tree(struct event_filter *filter, 
			      check_pred_tree_cb, &data);

			      check_pred_tree_cb, &data);

}

}





static int count_leafs(struct filter_pred *preds, struct filter_pred *root)

static int count_leafs_cb(enum move_type move, struct filter_pred *pred,

			  int *err, void *data)

{

{

	struct filter_pred *pred;

	int *count = data;

	enum move_type move = MOVE_DOWN;

	int count = 0;

	int done = 0;





	pred = root;

	if ((move == MOVE_DOWN) &&

	    (pred->left == FILTER_PRED_INVALID))

		(*count)++;





	do {

	return WALK_PRED_DEFAULT;

		switch (move) {

		case MOVE_DOWN:

			if (pred->left != FILTER_PRED_INVALID) {

				pred = &preds[pred->left];

				continue;

			}

			/* A leaf at the root is just a leaf in the tree */

			if (pred == root)

				return 1;

			count++;

			pred = get_pred_parent(pred, preds,

					       pred->parent, &move);

			continue;

		case MOVE_UP_FROM_LEFT:

			pred = &preds[pred->right];

			move = MOVE_DOWN;

			continue;

		case MOVE_UP_FROM_RIGHT:

			if (pred == root)

				break;

			pred = get_pred_parent(pred, preds,

					       pred->parent, &move);

			continue;

}

}

		done = 1;

	} while (!done);





static int count_leafs(struct filter_pred *preds, struct filter_pred *root)

{

	int count = 0, ret;



	ret = walk_pred_tree(preds, root, count_leafs_cb, &count);

	WARN_ON(ret);

	return count;

	return count;

}

}