From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965345AbcBDMgM (ORCPT ); Thu, 4 Feb 2016 07:36:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41711 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965138AbcBDMgJ (ORCPT ); Thu, 4 Feb 2016 07:36:09 -0500 Date: Thu, 4 Feb 2016 04:35:54 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, a.p.zijlstra@chello.nl Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, a.p.zijlstra@chello.nl In-Reply-To: <1453109064-1026-9-git-send-email-jolsa@kernel.org> References: <1453109064-1026-9-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Move UI initialization ahead of sort setup Git-Commit-ID: 9887804d01abf7a4e03cfd6be0312d0a5c4e4aba 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: 9887804d01abf7a4e03cfd6be0312d0a5c4e4aba Gitweb: http://git.kernel.org/tip/9887804d01abf7a4e03cfd6be0312d0a5c4e4aba Author: Jiri Olsa AuthorDate: Mon, 18 Jan 2016 10:24:06 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 3 Feb 2016 12:24:03 -0300 perf report: Move UI initialization ahead of sort setup The ui initialization changes hpp format callbacks, based on the used browser. Thus we need this init being processed before setup_sorting. Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1453109064-1026-9-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 54ce047..1eab50a 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -912,15 +912,6 @@ repeat: symbol_conf.cumulate_callchain = false; } - if (setup_sorting(session->evlist) < 0) { - if (sort_order) - parse_options_usage(report_usage, options, "s", 1); - if (field_order) - parse_options_usage(sort_order ? NULL : report_usage, - options, "F", 1); - goto error; - } - /* Force tty output for header output and per-thread stat. */ if (report.header || report.header_only || report.show_threads) use_browser = 0; @@ -930,6 +921,15 @@ repeat: else use_browser = 0; + if (setup_sorting(session->evlist) < 0) { + if (sort_order) + parse_options_usage(report_usage, options, "s", 1); + if (field_order) + parse_options_usage(sort_order ? NULL : report_usage, + options, "F", 1); + goto error; + } + if (report.header || report.header_only) { perf_session__fprintf_info(session, stdout, report.show_full_info);