aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2013-11-01 03:33:13 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-11-04 10:55:17 -0500
commit91aba0a62e24ff7a567e13e1d88deab711df6f0f (patch)
tree867280fb43d08d7954adf3654928b9af44142559 /tools
parent4bceffbc26fab2444742db59c6f8124c29e41369 (diff)
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-report.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 4df3161c7df2..25f83d5d66fd 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -947,8 +947,10 @@ repeat:
947 sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked"; 947 sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked";
948 } 948 }
949 949
950 if (setup_sorting() < 0) 950 if (setup_sorting() < 0) {
951 usage_with_options(report_usage, options); 951 parse_options_usage(report_usage, options, "s", 1);
952 goto error;
953 }
952 954
953 if (parent_pattern != default_parent_pattern) { 955 if (parent_pattern != default_parent_pattern) {
954 if (sort_dimension__add("parent") < 0) 956 if (sort_dimension__add("parent") < 0)