Commit 87cf8360 authored May 12, 2020 by Adrian Hunter Committed by Arnaldo Carvalho de Melo May 28, 2020

perf evlist: Disable 'immediate' events last

Events marked as 'immediate' are started before other events to ensure
that there is context at the start of the main tracing events. The same
is true at the end of tracing, so disable 'immediate' events after other
events.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: x86@kernel.org
Link: http://lore.kernel.org/lkml/20200512121922.8997-11-adrian.hunter@intel.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 61f82e3f

tools/perf/util/evlist.c

+21 −10

Original line number	Diff line number	Diff line
		@@ -380,11 +380,14 @@ void evlist__disable(struct evlist *evlist)
		{
		struct evsel *pos;
		struct affinity affinity;
		int cpu, i;
		int cpu, i, imm = 0;
		bool has_imm = false;

		if (affinity__setup(&affinity) < 0)
		return;

		/* Disable 'immediate' events last */
		for (imm = 0; imm <= 1; imm++) {
		evlist__for_each_cpu(evlist, i, cpu) {
		affinity__set(&affinity, cpu);

		@@ -393,9 +396,17 @@ void evlist__disable(struct evlist *evlist)
		continue;
		if (pos->disabled \|\| !evsel__is_group_leader(pos) \|\| !pos->core.fd)
		continue;
		if (pos->immediate)
		has_imm = true;
		if (pos->immediate != imm)
		continue;
		evsel__disable_cpu(pos, pos->cpu_iter - 1);
		}
		}
		if (!has_imm)
		break;
		}

		affinity__cleanup(&affinity);
		evlist__for_each_entry(evlist, pos) {
		if (!evsel__is_group_leader(pos) \|\| !pos->core.fd)

Admin message