perf evlist: Make perf_evlist__set_filter use perf_evsel__set_filter (94ad89bc) · Commits · 戴 / test

Instead of calling perf_evsel__apply_filter straight away, so that we can, in the next patches, expand the filter with more conditions before actually calling the ioctl to pass the end result filter to the kernel. Now we need to call perf_evlist__apply_filters() after the filter is completely setup, i.e. do the ioctl calls. The perf_evlist__apply_filters() method was already in place, because that is the model for the other tools that receives filters in the command line: go on setting then in the evsel->filter and only at the end, after parsing the whole command line, apply them. We get, as a bonus, a more expressive message that states which event, if any, failed to have the filter applied to, with an error message stating what happened. 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-f429pgz75ryz7tpe6v74etre@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/builtin-trace.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -2314,6 +2314,7 @@ out_delete_sys_enter:
		static int trace__run(struct trace trace, int argc, const char *argv)
		{
		struct perf_evlist *evlist = trace->evlist;
		struct perf_evsel *evsel;
		int err = -1, i;
		unsigned long before;
		const bool forks = argc > 0;
		@@ -2382,10 +2383,12 @@ static int trace__run(struct trace trace, int argc, const char *argv)
		else if (thread_map__pid(evlist->threads, 0) == -1)
		err = perf_evlist__set_filter_pid(evlist, getpid());

		if (err < 0) {
		printf("err=%d,%s\n", -err, strerror(-err));
		exit(1);
		}
		if (err < 0)
		goto out_error_mem;

		err = perf_evlist__apply_filters(evlist, &evsel);
		if (err < 0)
		goto out_error_apply_filters;

		err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false);
		if (err < 0)
		@@ -2488,6 +2491,13 @@ out_error_open:
		out_error:
		fprintf(trace->output, "%s\n", errbuf);
		goto out_delete_evlist;

		out_error_apply_filters:
		fprintf(trace->output,
		"Failed to set filter \"%s\" on event %s with %d (%s)\n",
		evsel->filter, perf_evsel__name(evsel), errno,
		strerror_r(errno, errbuf, sizeof(errbuf)));
		goto out_delete_evlist;
		}
		out_error_mem:
		fprintf(trace->output, "Not enough memory to run!\n");

tools/perf/util/evlist.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1175,11 +1175,9 @@ int perf_evlist__set_filter(struct perf_evlist evlist, const char filter)
		{
		struct perf_evsel *evsel;
		int err = 0;
		const int ncpus = cpu_map__nr(evlist->cpus),
		nthreads = thread_map__nr(evlist->threads);

		evlist__for_each(evlist, evsel) {
		err = perf_evsel__apply_filter(evsel, ncpus, nthreads, filter);
		err = perf_evsel__set_filter(evsel, filter);
		if (err)
		break;
		}

Admin message