Commit d37a92dc authored Nov 01, 2013 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Nov 04, 2013

perf top: Use parse_options_usage() for -s option failure



The -s (--sort) option was processed after normal option parsing so that
it cannot call the parse_options_usage() automatically.  Currently it
calls usage_with_options() which shows entire help messages for event
option.  Fix it by showing just -s options.

  $ perf top -s help
    Error: Unknown --sort key: `help'

   usage: perf top [<options>]

      -s, --sort <key[,key2...]>
                            sort by key(s): pid, comm, dso, symbol, ...

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Enthusiastically-Supported-by: Ingo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1383291195-24386-5-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 91aba0a6

tools/perf/builtin-top.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -1040,7 +1040,7 @@ parse_percent_limit(const struct option opt, const char arg,

		int cmd_top(int argc, const char *argv, const char prefix __maybe_unused)
		{
		int status;
		int status = -1;
		char errbuf[BUFSIZ];
		struct perf_top top = {
		.count_filter = 5,
		@@ -1159,8 +1159,10 @@ int cmd_top(int argc, const char *argv, const char prefix __maybe_unused)
		if (sort_order == default_sort_order)
		sort_order = "dso,symbol";

		if (setup_sorting() < 0)
		usage_with_options(top_usage, options);
		if (setup_sorting() < 0) {
		parse_options_usage(top_usage, options, "s", 1);
		goto out_delete_evlist;
		}

		/* display thread wants entries to be collapsed in a different tree */
		sort__need_collapse = 1;

Admin message