Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12467ae4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Introduce set_filter method 

Replaces existing filter string with the one provided.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-jst49z83li0yx3g18o54u51a@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f47805a2

tools/perf/util/evsel.c

+13 −0
Original line number Diff line number Diff line
@@ -823,6 +823,19 @@ int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads, 
				     (void *)filter);

}



int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter)

{

	char *new_filter = strdup(filter);



	if (new_filter != NULL) {

		free(evsel->filter);

		evsel->filter = new_filter;

		return 0;

	}



	return -1;

}



int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads)

{

	return perf_evsel__run_ioctl(evsel, ncpus, nthreads,

tools/perf/util/evsel.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel, 
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__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads,

			     const char *filter);

int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads);

tools/perf/util/parse-events.c

+1 −2
Original line number Diff line number Diff line
@@ -1177,8 +1177,7 @@ int parse_filter(const struct option *opt, const char *str, 
		return -1;

	}



	last->filter = strdup(str);

	if (last->filter == NULL) {

	if (perf_evsel__set_filter(last, str) < 0) {

		fprintf(stderr, "not enough memory to hold filter string\n");

		return -1;

	}