From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933481AbcBDMga (ORCPT ); Thu, 4 Feb 2016 07:36:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41719 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932717AbcBDMg2 (ORCPT ); Thu, 4 Feb 2016 07:36:28 -0500 Date: Thu, 4 Feb 2016 04:36:13 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, namhyung@kernel.org Reply-To: mingo@kernel.org, jolsa@kernel.org, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de 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 top: Move UI initialization ahead of sort setup Git-Commit-ID: 3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba 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: 3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba Gitweb: http://git.kernel.org/tip/3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 18 Jan 2016 10:24:06 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 3 Feb 2016 12:24:03 -0300 perf top: 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. Replica of a patch by Jiri for 'perf report'. Cc: David Ahern Cc: Jiri Olsa 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-top.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index f1bbe2a..a75de39 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1245,6 +1245,13 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) /* display thread wants entries to be collapsed in a different tree */ sort__need_collapse = 1; + if (top.use_stdio) + use_browser = 0; + else if (top.use_tui) + use_browser = 1; + + setup_browser(false); + if (setup_sorting(top.evlist) < 0) { if (sort_order) parse_options_usage(top_usage, options, "s", 1); @@ -1254,13 +1261,6 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) goto out_delete_evlist; } - if (top.use_stdio) - use_browser = 0; - else if (top.use_tui) - use_browser = 1; - - setup_browser(false); - status = target__validate(target); if (status) { target__strerror(target, status, errbuf, BUFSIZ);