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

Commit b15d0a4c authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Make perf_evsel__append_filter() generic 



By making function perf_evsel__append_filter() take a format rather than
an operator it is possible to reuse the code for other purposes (ex.
Intel PT and CoreSight) than tracepoints.

Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1474037045-31730-2-git-send-email-mathieu.poirier@linaro.org


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

tools/perf/builtin-trace.c

+7 −2
Original line number Diff line number Diff line
@@ -2143,6 +2143,7 @@ static int trace__add_syscall_newtp(struct trace *trace) 
static int trace__set_ev_qualifier_filter(struct trace *trace)

{

	int err = -1;

	struct perf_evsel *sys_exit;

	char *filter = asprintf_expr_inout_ints("id", !trace->not_ev_qualifier,

						trace->ev_qualifier_ids.nr,

						trace->ev_qualifier_ids.entries);
@@ -2150,8 +2151,12 @@ static int trace__set_ev_qualifier_filter(struct trace *trace) 
	if (filter == NULL)

		goto out_enomem;



	if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter, "&&", filter))

		err = perf_evsel__append_filter(trace->syscalls.events.sys_exit, "&&", filter);

	if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter,

				       "(%s) && (%s)", filter)) {

		sys_exit = trace->syscalls.events.sys_exit;

		err = perf_evsel__append_filter(sys_exit,

						"(%s) && (%s)", filter);

	}



	free(filter);

out:

tools/perf/util/evsel.c

+2 −2
Original line number Diff line number Diff line
@@ -1046,14 +1046,14 @@ int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter) 
}



int perf_evsel__append_filter(struct perf_evsel *evsel,

			      const char *op, const char *filter)

			      const char *fmt, const char *filter)

{

	char *new_filter;



	if (evsel->filter == NULL)

		return perf_evsel__set_filter(evsel, filter);



	if (asprintf(&new_filter,"(%s) %s (%s)", evsel->filter, op, filter) > 0) {

	if (asprintf(&new_filter, fmt, evsel->filter, filter) > 0) {

		free(evsel->filter);

		evsel->filter = new_filter;

		return 0;

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void perf_evsel__set_sample_id(struct perf_evsel *evsel, 


int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter);

int perf_evsel__append_filter(struct perf_evsel *evsel,

			      const char *op, const char *filter);

			      const char *fmt, const char *filter);

int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads,

			     const char *filter);

int perf_evsel__enable(struct perf_evsel *evsel);

tools/perf/util/parse-events.c

+2 −2
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static int set_filter(struct perf_evsel *evsel, const void *arg) 
		return -1;

	}



	if (perf_evsel__append_filter(evsel, "&&", str) < 0) {

	if (perf_evsel__append_filter(evsel, "(%s) && (%s)", str) < 0) {

		fprintf(stderr,

			"not enough memory to hold filter string\n");

		return -1;
@@ -1798,7 +1798,7 @@ static int add_exclude_perf_filter(struct perf_evsel *evsel, 


	snprintf(new_filter, sizeof(new_filter), "common_pid != %d", getpid());



	if (perf_evsel__append_filter(evsel, "&&", new_filter) < 0) {

	if (perf_evsel__append_filter(evsel, "(%s) && (%s)", new_filter) < 0) {

		fprintf(stderr,

			"not enough memory to hold filter string\n");

		return -1;