From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858AbbLNINa (ORCPT ); Mon, 14 Dec 2015 03:13:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52102 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbbLNIN2 (ORCPT ); Mon, 14 Dec 2015 03:13:28 -0500 Date: Mon, 14 Dec 2015 00:13:11 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, jolsa@redhat.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, jpoimboe@redhat.com, dsahern@gmail.com, acme@redhat.com, hpa@zytor.com Reply-To: a.p.zijlstra@chello.nl, tglx@linutronix.de, jpoimboe@redhat.com, acme@redhat.com, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, jolsa@redhat.com In-Reply-To: <1449716459-23004-3-git-send-email-namhyung@kernel.org> References: <1449716459-23004-3-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Delay UI browser setup after initialization is done Git-Commit-ID: 3df668e74a5bc60d74c2ce0b3498af2d77b4b556 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: 3df668e74a5bc60d74c2ce0b3498af2d77b4b556 Gitweb: http://git.kernel.org/tip/3df668e74a5bc60d74c2ce0b3498af2d77b4b556 Author: Namhyung Kim AuthorDate: Thu, 10 Dec 2015 12:00:54 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 10 Dec 2015 14:33:54 -0300 perf annotate: Delay UI browser setup after initialization is done Move setup_browser after all necessary initialization is done. This is to remove the browser dependency from usage_with_options and friends. Signed-off-by: Namhyung Kim Reviewed-by: Josh Poimboeuf Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449716459-23004-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-annotate.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 55f6f8d..1f00dc7 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -354,17 +354,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) annotate.sym_hist_filter = argv[0]; } - if (annotate.use_stdio) - use_browser = 0; - else if (annotate.use_tui) - use_browser = 1; - else if (annotate.use_gtk) - use_browser = 2; - file.path = input_name; - setup_browser(true); - annotate.session = perf_session__new(&file, false, &annotate.tool); if (annotate.session == NULL) return -1; @@ -379,6 +370,15 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) if (setup_sorting() < 0) usage_with_options(annotate_usage, options); + if (annotate.use_stdio) + use_browser = 0; + else if (annotate.use_tui) + use_browser = 1; + else if (annotate.use_gtk) + use_browser = 2; + + setup_browser(true); + ret = __cmd_annotate(&annotate); out_delete: