[tip:perf/core] perf top: Move UI initialization ahead of sort setup

Path	csiph.com!2.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf top: Move UI initialization ahead of sort setup
Date	Thu, 04 Feb 2016 13:40:02 +0100
Message-ID	<qYrmy-da-3@gated-at.bofh.it> (permalink)
References	<qSeil-73y-7@gated-at.bofh.it>
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
Git-Commit-ID	3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> 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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	56
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Thu, 4 Feb 2016 04:36:13 -0800
X-Original-Message-ID	<tip-3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba@git.kernel.org>
X-Original-References	<1453109064-1026-9-git-send-email-jolsa@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1326728

Show key headers only | View raw

Commit-ID:  3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba
Gitweb:     http://git.kernel.org/tip/3ee60c3b18bd4bf30ea9b70e7542116bb5c205ba
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 18 Jan 2016 10:24:06 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-9-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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);

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:perf/core] perf top:   Move UI initialization ahead of sort setup tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2016-02-04 13:40 +0100

csiph-web