From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752929AbdDLFql (ORCPT ); Wed, 12 Apr 2017 01:46:41 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52155 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752761AbdDLFqk (ORCPT ); Wed, 12 Apr 2017 01:46:40 -0400 Date: Tue, 11 Apr 2017 22:41:03 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: linux-kernel@vger.kernel.org, davidcc@google.com, peterz@infradead.org, hekuang@huawei.com, tglx@linutronix.de, eranian@google.com, wangnan0@huawei.com, sque@chromium.org, hpa@zytor.com, acme@redhat.com, jolsa@kernel.org, ak@linux.intel.com, mhiramat@kernel.org, mingo@kernel.org, pjt@google.com, alexander.shishkin@linux.intel.com Reply-To: alexander.shishkin@linux.intel.com, mhiramat@kernel.org, ak@linux.intel.com, pjt@google.com, mingo@kernel.org, hpa@zytor.com, sque@chromium.org, acme@redhat.com, jolsa@kernel.org, eranian@google.com, wangnan0@huawei.com, tglx@linutronix.de, hekuang@huawei.com, davidcc@google.com, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <20170410201432.24807-6-davidcc@google.com> References: <20170410201432.24807-6-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf session: Don't rely on evlist in pipe mode Git-Commit-ID: 0973ad97c187e06aece61f685b9c3b2d93290a73 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: 0973ad97c187e06aece61f685b9c3b2d93290a73 Gitweb: http://git.kernel.org/tip/0973ad97c187e06aece61f685b9c3b2d93290a73 Author: David Carrillo-Cisneros AuthorDate: Mon, 10 Apr 2017 13:14:30 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 11 Apr 2017 16:22:20 -0300 perf session: Don't rely on evlist in pipe mode Session sets a number parameters that rely on evlist. These parameters are not used in pipe-mode and should not be set, since evlist is unavailable. Fix that. Signed-off-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170410201432.24807-6-davidcc@google.com [ Check if file != NULL in perf_session__new(), like when used by builtin-top.c ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a25302b..7b740a7 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -140,8 +140,14 @@ struct perf_session *perf_session__new(struct perf_data_file *file, if (perf_session__open(session) < 0) goto out_close; - perf_session__set_id_hdr_size(session); - perf_session__set_comm_exec(session); + /* + * set session attributes that are present in perf.data + * but not in pipe-mode. + */ + if (!file->is_pipe) { + perf_session__set_id_hdr_size(session); + perf_session__set_comm_exec(session); + } } } else { session->machines.host.env = &perf_env; @@ -156,7 +162,11 @@ struct perf_session *perf_session__new(struct perf_data_file *file, pr_warning("Cannot read kernel map\n"); } - if (tool && tool->ordering_requires_timestamps && + /* + * In pipe-mode, evlist is empty until PERF_RECORD_HEADER_ATTR is + * processed, so perf_evlist__sample_id_all is not meaningful here. + */ + if ((!file || !file->is_pipe) && tool && tool->ordering_requires_timestamps && 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;