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

Commit 3f51972c authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add strfilter__string to recover rules string 



Add strfilter__string to recover rules string from strfilter.  This will
be good for debugging.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150424094746.23967.52434.stgit@localhost.localdomain


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4e60a2ca

tools/perf/util/strfilter.c

+67 −0
Original line number Original line Diff line number Diff line
@@ -237,3 +237,70 @@ bool strfilter__compare(struct strfilter *filter, const char *str) 
		return false;

		return false;

	return strfilter_node__compare(filter->root, str);

	return strfilter_node__compare(filter->root, str);

}

}



static int strfilter_node__sprint(struct strfilter_node *node, char *buf);



/* sprint node in parenthesis if needed */

static int strfilter_node__sprint_pt(struct strfilter_node *node, char *buf)

{

	int len;

	int pt = node->r ? 2 : 0;	/* don't need to check node->l */



	if (buf && pt)

		*buf++ = '(';

	len = strfilter_node__sprint(node, buf);

	if (len < 0)

		return len;

	if (buf && pt)

		*(buf + len) = ')';

	return len + pt;

}



static int strfilter_node__sprint(struct strfilter_node *node, char *buf)

{

	int len = 0, rlen;



	if (!node || !node->p)

		return -EINVAL;



	switch (*node->p) {

	case '|':

	case '&':

		len = strfilter_node__sprint_pt(node->l, buf);

		if (len < 0)

			return len;

	case '!':

		if (buf) {

			*(buf + len++) = *node->p;

			buf += len;

		} else

			len++;

		rlen = strfilter_node__sprint_pt(node->r, buf);

		if (rlen < 0)

			return rlen;

		len += rlen;

		break;

	default:

		len = strlen(node->p);

		if (buf)

			strcpy(buf, node->p);

	}



	return len;

}



char *strfilter__string(struct strfilter *filter)

{

	int len;

	char *ret = NULL;



	len = strfilter_node__sprint(filter->root, NULL);

	if (len < 0)

		return NULL;



	ret = malloc(len + 1);

	if (ret)

		strfilter_node__sprint(filter->root, ret);



	return ret;

}

tools/perf/util/strfilter.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -71,4 +71,13 @@ bool strfilter__compare(struct strfilter *filter, const char *str); 
 */

 */

void strfilter__delete(struct strfilter *filter);

void strfilter__delete(struct strfilter *filter);





/**

 * strfilter__string - Reconstruct a rule string from filter

 * @filter: String filter to reconstruct

 *

 * Reconstruct a rule string from @filter. This will be good for

 * debug messages. Note that returning string must be freed afterward.

 */

char *strfilter__string(struct strfilter *filter);



#endif
 
#endif