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

perf report: 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 report -s help
    Error: Unknown --sort key: `help'

   usage: perf report [<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-4-git-send-email-namhyung@kernel.org


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

parent 4bceffbc

tools/perf/builtin-report.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -947,8 +947,10 @@ int cmd_report(int argc, const char *argv, const char prefix __maybe_unused)
	sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked";		sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked";
	}		}

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

	if (parent_pattern != default_parent_pattern) {		if (parent_pattern != default_parent_pattern) {
	if (sort_dimension__add("parent") < 0)		if (sort_dimension__add("parent") < 0)