Commit-ID: aae59fab978e143f24d22e52f075c4be3ee4e628 Gitweb: http://git.kernel.org/tip/aae59fab978e143f24d22e52f075c4be3ee4e628 Author: Arnaldo Carvalho de Melo <a...@redhat.com> AuthorDate: Tue, 31 Mar 2015 09:53:50 -0300 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Tue, 31 Mar 2015 17:52:31 -0300
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 <dsah...@gmail.com> Reviewed-by: David Ahern <dsah...@gmail.com> Tested-by: David Ahern <dsah...@gmail.com> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Borislav Petkov <b...@suse.de> Cc: Don Zickus <dzic...@redhat.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Stephane Eranian <eran...@google.com> Link: http://lkml.kernel.org/n/tip-b1xxk0rwkz2a0gip1uufm...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/session.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index adf0740..89c6679 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
