forked from luck/tmp_suning_uos_patched
perf evsel: New tracepoint specific function
Making function perf_evsel__append_filter() static and introducing a new tracepoint specific function to append filters. That way we eliminate redundant code and avoid formatting mistake. 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-3-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
b15d0a4c82
commit
3541c034d9
|
@ -2151,11 +2151,10 @@ 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,
|
||||
"(%s) && (%s)", filter)) {
|
||||
if (!perf_evsel__append_tp_filter(trace->syscalls.events.sys_enter,
|
||||
filter)) {
|
||||
sys_exit = trace->syscalls.events.sys_exit;
|
||||
err = perf_evsel__append_filter(sys_exit,
|
||||
"(%s) && (%s)", filter);
|
||||
err = perf_evsel__append_tp_filter(sys_exit, filter);
|
||||
}
|
||||
|
||||
free(filter);
|
||||
|
|
|
@ -1045,8 +1045,8 @@ int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int perf_evsel__append_filter(struct perf_evsel *evsel,
|
||||
const char *fmt, const char *filter)
|
||||
static int perf_evsel__append_filter(struct perf_evsel *evsel,
|
||||
const char *fmt, const char *filter)
|
||||
{
|
||||
char *new_filter;
|
||||
|
||||
|
@ -1062,6 +1062,11 @@ int perf_evsel__append_filter(struct perf_evsel *evsel,
|
|||
return -1;
|
||||
}
|
||||
|
||||
int perf_evsel__append_tp_filter(struct perf_evsel *evsel, const char *filter)
|
||||
{
|
||||
return perf_evsel__append_filter(evsel, "(%s) && (%s)", filter);
|
||||
}
|
||||
|
||||
int perf_evsel__enable(struct perf_evsel *evsel)
|
||||
{
|
||||
int nthreads = thread_map__nr(evsel->threads);
|
||||
|
|
|
@ -235,8 +235,7 @@ void perf_evsel__set_sample_id(struct perf_evsel *evsel,
|
|||
bool use_sample_identifier);
|
||||
|
||||
int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter);
|
||||
int perf_evsel__append_filter(struct perf_evsel *evsel,
|
||||
const char *fmt, const char *filter);
|
||||
int perf_evsel__append_tp_filter(struct perf_evsel *evsel, 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);
|
||||
|
|
|
@ -1767,7 +1767,7 @@ static int set_filter(struct perf_evsel *evsel, const void *arg)
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (perf_evsel__append_filter(evsel, "(%s) && (%s)", str) < 0) {
|
||||
if (perf_evsel__append_tp_filter(evsel, 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, "(%s) && (%s)", new_filter) < 0) {
|
||||
if (perf_evsel__append_tp_filter(evsel, new_filter) < 0) {
|
||||
fprintf(stderr,
|
||||
"not enough memory to hold filter string\n");
|
||||
return -1;
|
||||
|
|
Loading…
Reference in New Issue
Block a user