Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1288166

[PATCH 1/7] perf annotate: Check argument before calling setup_browser()

Show all headers | View raw

This is necessary to get rid of the browser dependency from
usage_with_options() and its friends.  Because there's no code
changing the argc and argv, it'd be ok to check it early.

Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/builtin-annotate.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 2bf9b3fd9e61..55f6f8dab5d4 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -343,6 +343,16 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
 		return ret;
 
 	argc = parse_options(argc, argv, options, annotate_usage, 0);
+	if (argc) {
+		/*
+		 * Special case: if there's an argument left then assume that
+		 * it's a symbol filter:
+		 */
+		if (argc > 1)
+			usage_with_options(annotate_usage, options);
+
+		annotate.sym_hist_filter = argv[0];
+	}
 
 	if (annotate.use_stdio)
 		use_browser = 0;
@@ -369,17 +379,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (setup_sorting() < 0)
 		usage_with_options(annotate_usage, options);
 
-	if (argc) {
-		/*
-		 * Special case: if there's an argument left then assume that
-		 * it's a symbol filter:
-		 */
-		if (argc > 1)
-			usage_with_options(annotate_usage, options);
-
-		annotate.sym_hist_filter = argv[0];
-	}
-
 	ret = __cmd_annotate(&annotate);
 
 out_delete:
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCHSET 0/7] perf tools: Remove browser dependency from usage_with_options() Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  [PATCH 5/7] perf top: Delay UI browser setup after initialization is done Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
    Re: [PATCH 5/7] perf top: Delay UI browser setup after  initialization is done Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-10 18:50 +0100
      Re: [PATCH 5/7] perf top: Delay UI browser setup after  initialization is done Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-10 19:00 +0100
        Re: [PATCH 5/7] perf top: Delay UI browser setup after  initialization is done Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-10 19:10 +0100
  [PATCH 3/7] perf kvm: Remove invocation of setup/exit_browser() Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  [PATCH 7/7] perf tools: Get rid of exit_browser() from usage_with_options() Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  [PATCH 4/7] perf report: Check argument before calling setup_browser() Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  [PATCH 2/7] perf annotate: Delay UI browser setup after initialization is done Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  [PATCH 1/7] perf annotate: Check argument before calling setup_browser() Namhyung Kim <namhyung@kernel.org> - 2015-12-10 04:10 +0100
  Re: [PATCHSET 0/7] perf tools: Remove browser dependency from  usage_with_options() Josh Poimboeuf <jpoimboe@redhat.com> - 2015-12-10 16:20 +0100
    Re: [PATCHSET 0/7] perf tools: Remove browser dependency from  usage_with_options() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-10 20:00 +0100

csiph-web