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 <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-18-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 9461583c53d9355325b31fad5087af37d3cd6c0e..e71c3cc939246010753e92622fccf1c6f3656feb 100644 (file)
--- 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 855d286298ebf07363ba686751cc01732d2405b3..5aeb7260c8e1fd0c0f0ad0ff1783188ef42ed3dc 100644 (file)
--- 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 c338ce14e8aac9285a617b05a223350352dd42a0..35f7e7ff3c5e50abc27981d36dbcd878cce74931 100644 (file)
--- 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);