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

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

tracing/filter: Change fold_pred function to use walk_pred_tree 



Changing fold_pred_tree function to use unified predicates tree
processing.

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


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

kernel/trace/trace_events_filter.c

+33 −35
Original line number Original line Diff line number Diff line
@@ -1439,13 +1439,40 @@ static int count_leafs(struct filter_pred *preds, struct filter_pred *root) 
	return count;

	return count;

}

}





struct fold_pred_data {

	struct filter_pred *root;

	int count;

	int children;

};



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

			int *err, void *data)

{

	struct fold_pred_data *d = data;

	struct filter_pred *root = d->root;



	if (move != MOVE_DOWN)

		return WALK_PRED_DEFAULT;

	if (pred->left != FILTER_PRED_INVALID)

		return WALK_PRED_DEFAULT;



	if (WARN_ON(d->count == d->children)) {

		*err = -EINVAL;

		return WALK_PRED_ABORT;

	}



	pred->index &= ~FILTER_PRED_FOLD;

	root->ops[d->count++] = pred->index;

	return WALK_PRED_DEFAULT;

}



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

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

{

{

	struct filter_pred *pred;

	struct fold_pred_data data = {

	enum move_type move = MOVE_DOWN;

		.root  = root,

	int count = 0;

		.count = 0,

	};

	int children;

	int children;

	int done = 0;





	/* No need to keep the fold flag */

	/* No need to keep the fold flag */

	root->index &= ~FILTER_PRED_FOLD;

	root->index &= ~FILTER_PRED_FOLD;
@@ -1463,37 +1490,8 @@ static int fold_pred(struct filter_pred *preds, struct filter_pred *root) 
		return -ENOMEM;

		return -ENOMEM;





	root->val = children;

	root->val = children;



	data.children = children;

	pred = root;

	return walk_pred_tree(preds, root, fold_pred_cb, &data);

	do {

		switch (move) {

		case MOVE_DOWN:

			if (pred->left != FILTER_PRED_INVALID) {

				pred = &preds[pred->left];

				continue;

			}

			if (WARN_ON(count == children))

				return -EINVAL;

			pred->index &= ~FILTER_PRED_FOLD;

			root->ops[count++] = pred->index;

			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);



	return 0;

}

}





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

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