From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222AbbDBMYc (ORCPT ); Thu, 2 Apr 2015 08:24:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60365 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751469AbbDBMY3 (ORCPT ); Thu, 2 Apr 2015 08:24:29 -0400 Date: Thu, 2 Apr 2015 05:24:11 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, fweisbec@gmail.com, dsahern@gmail.com, eranian@google.com, dzickus@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, bp@suse.de, tglx@linutronix.de, mingo@kernel.org Reply-To: hpa@zytor.com, fweisbec@gmail.com, dsahern@gmail.com, jolsa@redhat.com, dzickus@redhat.com, eranian@google.com, acme@redhat.com, linux-kernel@vger.kernel.org, bp@suse.de, adrian.hunter@intel.com, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf session: Always initialize ordered_events Git-Commit-ID: aae59fab978e143f24d22e52f075c4be3ee4e628 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: aae59fab978e143f24d22e52f075c4be3ee4e628 Gitweb: http://git.kernel.org/tip/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 Link: http://lkml.kernel.org/n/tip-b1xxk0rwkz2a0gip1uufmjqg@git.kernel.org 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; 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;