Commit aae59fab authored Mar 31, 2015 by Arnaldo Carvalho de Melo

perf session: Always initialize ordered_events



Even when it is not used to actually reorder events, some of its fields
are used, like session->ordered_events->tool, to shorten function
signatures where tool, for instance, was being passed, as the tool is
needed for the ordered_events code, we need it there and might as well
use it for other perf_session needs.

This fixes a problem where 'perf script' had some condition that made
session->ordered_events not to be initialized even with its
script->tool ordered_events related flags asking for it to be, which
looks like another bug and needs to be investigated further.

Always initializing session->ordered_events at least leaves the current
assumptions in place, so do it now.

Reported-by: David Ahern <dsahern@gmail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Tested-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
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-b1xxk0rwkz2a0gip1uufmjqg@git.kernel.org


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

parent ca6c41c5

tools/perf/util/session.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@ struct perf_session perf_session__new(struct perf_data_file file,

		session->repipe = repipe;
		machines__init(&session->machines);
		ordered_events__init(&session->ordered_events, &session->machines,
		session->evlist, tool, ordered_events__deliver_event);

		if (file) {
		if (perf_data_file__open(file))
		@@ -139,9 +141,6 @@ struct perf_session perf_session__new(struct perf_data_file file,
		tool->ordered_events && !perf_evlist__sample_id_all(session->evlist)) {
		dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n");
		tool->ordered_events = false;
		} else {
		ordered_events__init(&session->ordered_events, &session->machines,
		session->evlist, tool, ordered_events__deliver_event);
		}

		return session;