LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Jiri Olsa <jolsa@redhat.com>, LKML <linux-kernel@vger.kernel.org>,
	David Ahern <dsahern@gmail.com>,
	Josh Poimboeuf <jpoimboe@redhat.com>
Subject: [PATCH 2/7] perf annotate: Delay UI browser setup after initialization is done
Date: Thu, 10 Dec 2015 12:00:54 +0900
Message-ID: <1449716459-23004-3-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1449716459-23004-1-git-send-email-namhyung@kernel.org>

Move setup_browser after all necessary initialization is done.  This
is to remove the browser dependency from usage_with_options and
friends.

Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 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 55f6f8dab5d4..1f00dc7cecba 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:
-- 
2.6.2


  parent reply index

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-10  3:00 [PATCHSET 0/7] perf tools: Remove browser dependency from usage_with_options() Namhyung Kim
2015-12-10  3:00 ` [PATCH 1/7] perf annotate: Check argument before calling setup_browser() Namhyung Kim
2015-12-14  8:12   ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-12-10  3:00 ` Namhyung Kim [this message]
2015-12-14  8:13   ` [tip:perf/core] perf annotate: Delay UI browser setup after initialization is done tip-bot for Namhyung Kim
2015-12-10  3:00 ` [PATCH 3/7] perf kvm: Remove invocation of setup/exit_browser() Namhyung Kim
2015-12-14  8:13   ` [tip:perf/core] perf kvm: Remove invocation of setup/exit_browser () tip-bot for Namhyung Kim
2015-12-10  3:00 ` [PATCH 4/7] perf report: Check argument before calling setup_browser() Namhyung Kim
2015-12-14  8:13   ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-12-10  3:00 ` [PATCH 5/7] perf top: Delay UI browser setup after initialization is done Namhyung Kim
2015-12-10 17:43   ` Arnaldo Carvalho de Melo
2015-12-10 17:52     ` Arnaldo Carvalho de Melo
2015-12-10 18:06       ` Arnaldo Carvalho de Melo
2015-12-10  3:00 ` [PATCH 6/7] perf tools: Free strlist on error path Namhyung Kim
2015-12-14  8:14   ` [tip:perf/core] perf thread_map: Free strlist on constructor " tip-bot for Namhyung Kim
2015-12-10  3:00 ` [PATCH 7/7] perf tools: Get rid of exit_browser() from usage_with_options() Namhyung Kim
2015-12-14  8:14   ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-12-10 15:10 ` [PATCHSET 0/7] perf tools: Remove browser dependency " Josh Poimboeuf
2015-12-10 18:53   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449716459-23004-3-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git