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

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Jiri Olsa <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf report: Move UI initialization ahead of sort setup
Date	Thu, 04 Feb 2016 13:40:04 +0100
Message-ID	<qYrmA-da-61@gated-at.bofh.it> (permalink)
References	<qSeil-73y-7@gated-at.bofh.it>
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
Git-Commit-ID	9887804d01abf7a4e03cfd6be0312d0a5c4e4aba
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	59
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Thu, 4 Feb 2016 04:35:54 -0800
X-Original-Message-ID	<tip-9887804d01abf7a4e03cfd6be0312d0a5c4e4aba@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:1326747

Show key headers only | View raw

Commit-ID:  9887804d01abf7a4e03cfd6be0312d0a5c4e4aba
Gitweb:     http://git.kernel.org/tip/9887804d01abf7a4e03cfd6be0312d0a5c4e4aba
Author:     Jiri Olsa <jolsa@kernel.org>
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 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 <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
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-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);

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

Thread

[tip:perf/core] perf report:   Move UI initialization ahead of sort setup tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-02-04 13:40 +0100

csiph-web