From: Jiri Olsa Date: Sun, 21 Jul 2019 11:24:04 +0000 (+0200) Subject: perf evsel: Rename perf_evsel__apply_filter() to evsel__apply_filter() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=24e376b24582648d363df4e0a6bcc2ffcecd211e;p=openwrt%2Fstaging%2Fblogic.git perf evsel: Rename perf_evsel__apply_filter() to evsel__apply_filter() Rename perf_evsel__apply_filter() to evsel__apply_filter(), so we don't have a name clash when we add perf_evsel__apply_filter() in libperf. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Alexey Budankov Cc: Andi Kleen Cc: Michael Petlan Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20190721112506.12306-18-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 9461583c53d9..e71c3cc93924 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1158,7 +1158,7 @@ int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel) * filters only work for tracepoint event, which doesn't have cpu limit. * So evlist and evsel should always be same. */ - err = perf_evsel__apply_filter(evsel, evsel->filter); + err = evsel__apply_filter(evsel, evsel->filter); if (err) { *err_evsel = evsel; break; diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 855d286298eb..5aeb7260c8e1 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1187,7 +1187,7 @@ static int perf_evsel__run_ioctl(struct evsel *evsel, return 0; } -int perf_evsel__apply_filter(struct evsel *evsel, const char *filter) +int evsel__apply_filter(struct evsel *evsel, const char *filter) { return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_SET_FILTER, diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index c338ce14e8aa..35f7e7ff3c5e 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -294,7 +294,7 @@ int perf_evsel__set_filter(struct evsel *evsel, const char *filter); int perf_evsel__append_tp_filter(struct evsel *evsel, const char *filter); int perf_evsel__append_addr_filter(struct evsel *evsel, const char *filter); -int perf_evsel__apply_filter(struct evsel *evsel, const char *filter); +int evsel__apply_filter(struct evsel *evsel, const char *filter); int evsel__enable(struct evsel *evsel); int evsel__disable(struct evsel *evsel);