From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756832AbcKXEQS (ORCPT ); Wed, 23 Nov 2016 23:16:18 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49614 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756786AbcKXEQQ (ORCPT ); Wed, 23 Nov 2016 23:16:16 -0500 Date: Wed, 23 Nov 2016 20:16:01 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, dzickus@redhat.com, a.p.zijlstra@chello.nl, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@redhat.com, dsahern@gmail.com, jmario@redhat.com, andi@firstfloor.org, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org Reply-To: hpa@zytor.com, dzickus@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, andi@firstfloor.org, jmario@redhat.com, mingo@kernel.org, jolsa@kernel.org, jolsa@redhat.com, tglx@linutronix.de, namhyung@kernel.org, dsahern@gmail.com In-Reply-To: <1479764011-10732-3-git-send-email-jolsa@kernel.org> References: <1479764011-10732-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf c2c report: Setup browser after opening perf.data Git-Commit-ID: e8c5fe101e55e4c45a2859cea2b4c374595f8867 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: e8c5fe101e55e4c45a2859cea2b4c374595f8867 Gitweb: http://git.kernel.org/tip/e8c5fe101e55e4c45a2859cea2b4c374595f8867 Author: Jiri Olsa AuthorDate: Mon, 21 Nov 2016 22:33:27 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 Nov 2016 10:44:04 -0300 perf c2c report: Setup browser after opening perf.data Because of the early browser switch we won't get possible error messages, as it will clear the screen right after showing the message, e.g.: Before: $ sudo perf c2c report -d lcl $ After: $ sudo perf c2c report -d lcl File perf.data not owned by current user or root (use -f to override) $ $ ls -la perf.data -rw-------. 1 acme acme 26648 Nov 22 15:11 perf.data $ Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Don Zickus Cc: Joe Mario Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1479764011-10732-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-c2c.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index c6d0dda..15addb0 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2535,13 +2535,6 @@ static int perf_c2c__report(int argc, const char **argv) if (c2c.stats_only) c2c.use_stdio = true; - if (c2c.use_stdio) - use_browser = 0; - else - use_browser = 1; - - setup_browser(false); - if (!input_name || !strlen(input_name)) input_name = "perf.data"; @@ -2568,6 +2561,7 @@ static int perf_c2c__report(int argc, const char **argv) pr_debug("No memory for session\n"); goto out; } + err = setup_nodes(session); if (err) { pr_err("Failed setup nodes\n"); @@ -2587,6 +2581,13 @@ static int perf_c2c__report(int argc, const char **argv) goto out_session; } + if (c2c.use_stdio) + use_browser = 0; + else + use_browser = 1; + + setup_browser(false); + err = perf_session__process_events(session); if (err) { pr_err("failed to process sample\n");