android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Make perf_evsel__append_filter() generic

Browse Source 
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: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Adrian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Mathieu Poirier
2016-09-16 08:44:03 -06:00
committed by Arnaldo Carvalho de Melo
parent 2acad19500
commit b15d0a4c82
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/builtin-trace.c
View File

@ -2143,6 +2143,7 @@ out_delete_sys_enter:
static int trace__set_ev_qualifier_filter(struct trace *trace) static int trace__set_ev_qualifier_filter(struct trace *trace)
{ {
int err = -1; int err = -1;
struct perf_evsel *sys_exit;
char *filter = asprintf_expr_inout_ints("id", !trace->not_ev_qualifier, char *filter = asprintf_expr_inout_ints("id", !trace->not_ev_qualifier,
trace->ev_qualifier_ids.nr, trace->ev_qualifier_ids.nr,
trace->ev_qualifier_ids.entries); trace->ev_qualifier_ids.entries);
@ -2150,8 +2151,12 @@ static int trace__set_ev_qualifier_filter(struct trace *trace)
if (filter == NULL) if (filter == NULL)
goto out_enomem; goto out_enomem;
if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter, "&&", filter)) if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter,
err = perf_evsel__append_filter(trace->syscalls.events.sys_exit, "&&", filter); "(%s) && (%s)", filter)) {
sys_exit = trace->syscalls.events.sys_exit;
err = perf_evsel__append_filter(sys_exit,
"(%s) && (%s)", filter);
}
free(filter); free(filter);
out: out:

4
tools/perf/util/evsel.c
View File

@ -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, int perf_evsel__append_filter(struct perf_evsel *evsel,
const char *op, const char *filter) const char *fmt, const char *filter)
{ {
char *new_filter; char *new_filter;
if (evsel->filter == NULL) if (evsel->filter == NULL)
return perf_evsel__set_filter(evsel, filter); 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); free(evsel->filter);
evsel->filter = new_filter; evsel->filter = new_filter;
return 0; return 0;

2
tools/perf/util/evsel.h
View File

@ -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__set_filter(struct perf_evsel *evsel, const char *filter);
int perf_evsel__append_filter(struct perf_evsel *evsel, 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, int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads,
const char *filter); const char *filter);
int perf_evsel__enable(struct perf_evsel *evsel); int perf_evsel__enable(struct perf_evsel *evsel);

4
tools/perf/util/parse-events.c
View File

@ -1767,7 +1767,7 @@ static int set_filter(struct perf_evsel *evsel, const void *arg)
return -1; return -1;
} }
if (perf_evsel__append_filter(evsel, "&&", str) < 0) { if (perf_evsel__append_filter(evsel, "(%s) && (%s)", str) < 0) {
fprintf(stderr, fprintf(stderr,
"not enough memory to hold filter string\n"); "not enough memory to hold filter string\n");
return -1; 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()); 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, fprintf(stderr,
"not enough memory to hold filter string\n"); "not enough memory to hold filter string\n");
return -1; return -1;