LKML Archive on
help / color / mirror / Atom feed
* [tip:perf/core] perf session: Always initialize ordered_events
@ 2015-04-02 12:24 tip-bot for Arnaldo Carvalho de Melo
  0 siblings, 0 replies; only message in thread
From: tip-bot for Arnaldo Carvalho de Melo @ 2015-04-02 12:24 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: hpa, fweisbec, dsahern, eranian, dzickus, jolsa, linux-kernel,
	acme, namhyung, adrian.hunter, bp, tglx, mingo

Commit-ID:  aae59fab978e143f24d22e52f075c4be3ee4e628
Author:     Arnaldo Carvalho de Melo <>
AuthorDate: Tue, 31 Mar 2015 09:53:50 -0300
Committer:  Arnaldo Carvalho de Melo <>
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 <>
Reviewed-by: David Ahern <>
Tested-by: David Ahern <>
Cc: Adrian Hunter <>
Cc: Borislav Petkov <>
Cc: Don Zickus <>
Cc: Frederic Weisbecker <>
Cc: Jiri Olsa <>
Cc: Namhyung Kim <>
Cc: Stephane Eranian <>
Signed-off-by: Arnaldo Carvalho de Melo <>
 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;
+	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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-02 12:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-02 12:24 [tip:perf/core] perf session: Always initialize ordered_events tip-bot for Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).