Commit 24e376b2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9a10bb22

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/evsel.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE