[tip:perf/core] perf tools: Improve ambiguous option help message

From	tip-bot for Namhyung Kim <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf tools: Improve ambiguous option help message
Date	2015-10-29 10:50 +0100
Message-ID	<qoS0i-6Ul-29@gated-at.bofh.it> (permalink)
References	<qn9eV-4A2-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  a5f4a6932ec2e1a53642e97a1be64bc7b169942f
Gitweb:     http://git.kernel.org/tip/a5f4a6932ec2e1a53642e97a1be64bc7b169942f
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Sun, 25 Oct 2015 00:49:24 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 26 Oct 2015 13:59:06 -0300

perf tools: Improve ambiguous option help message

Currently if an option name is ambiguous it only prints first two
matched option names but no help.  It'd be better it could show all
possible names and help messages too.

Before:
  $ perf report --show
    Error: Ambiguous option: show (could be --show-total-period or
                                            --show-ref-call-graph)
   Usage: perf report [<options>]

After:
  $ perf report --show
    Error: Ambiguous option: show (could be --show-total-period or
                                            --show-ref-call-graph)
   Usage: perf report [<options>]

      -n, --show-nr-samples
                              Show a column with the number of samples
          --showcpuutilization
                              Show sample percentage for different cpu modes
      -I, --show-info         Display extended information about perf.data file
          --show-total-period
                              Show a column with the sum of periods
          --show-ref-call-graph
                              Show callgraph from reference event

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1445701767-12731-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/parse-options.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 22c2806..b8d9822 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -770,24 +770,23 @@ int parse_options_usage(const char * const *usagestr,
 opt:
 	for (  ; opts->type != OPTION_END; opts++) {
 		if (short_opt) {
-			if (opts->short_name == *optstr)
+			if (opts->short_name == *optstr) {
+				print_option_help(opts, 0);
 				break;
+			}
 			continue;
 		}
 
 		if (opts->long_name == NULL)
 			continue;
 
-		if (!prefixcmp(optstr, opts->long_name))
-			break;
-		if (!prefixcmp(optstr, "no-") &&
-		    !prefixcmp(optstr + 3, opts->long_name))
-			break;
+		if (!prefixcmp(opts->long_name, optstr))
+			print_option_help(opts, 0);
+		if (!prefixcmp("no-", optstr) &&
+		    !prefixcmp(opts->long_name, optstr + 3))
+			print_option_help(opts, 0);
 	}
 
-	if (opts->type != OPTION_END)
-		print_option_help(opts, 0);
-
 	return PARSE_OPT_HELP;
 }
 
--
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 | Find similar | Unroll thread

Thread

[PATCH 1/4] perf tools: Improve ambiguous option help message Namhyung Kim <namhyung@kernel.org> - 2015-10-24 17:50 +0200
  [PATCH 2/4] perf report: Rename to --show-cpu-utilization Namhyung Kim <namhyung@kernel.org> - 2015-10-24 17:50 +0200
    Re: [PATCH 2/4] perf report: Rename to --show-cpu-utilization Ingo Molnar <mingo@kernel.org> - 2015-10-25 10:00 +0100
    [tip:perf/core] perf report: Rename to --show-cpu-utilization tip-bot for Namhyung Kim <tipbot@zytor.com> - 2015-10-29 10:50 +0100
  [PATCH 4/4] perf tools: Introduce usage_with_options_msg() Namhyung Kim <namhyung@kernel.org> - 2015-10-24 17:50 +0200
    Re: [PATCH 4/4] perf tools: Introduce usage_with_options_msg() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-26 18:20 +0100
    RE: [PATCH 4/4] perf tools: Introduce usage_with_options_msg() 平松雅巳 / HIRAMATU，MASAMI   <masami.hiramatsu.pt@hitachi.com> - 2015-10-27 00:20 +0100
      Re: [PATCH 4/4] perf tools: Introduce usage_with_options_msg() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-27 13:40 +0100
    [tip:perf/core] perf tools: Introduce usage_with_options_msg() tip-bot for Namhyung Kim <tipbot@zytor.com> - 2015-10-29 10:50 +0100
  [PATCH 3/4] perf tools: Setup pager when printing usage and help Namhyung Kim <namhyung@kernel.org> - 2015-10-24 17:50 +0200
    Re: [PATCH 3/4] perf tools: Setup pager when printing usage and help Ingo Molnar <mingo@kernel.org> - 2015-10-25 10:10 +0100
    [tip:perf/core] perf tools:   Setup pager when printing usage and help tip-bot for Namhyung Kim <tipbot@zytor.com> - 2015-10-29 10:50 +0100
  Re: [PATCH 1/4] perf tools: Improve ambiguous option help message Ingo Molnar <mingo@kernel.org> - 2015-10-25 09:50 +0100
  [tip:perf/core] perf tools: Improve ambiguous option help message tip-bot for Namhyung Kim <tipbot@zytor.com> - 2015-10-29 10:50 +0100

csiph-web