diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2013-11-01 03:33:14 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-11-04 10:56:41 -0500 |
commit | d37a92dcb45094dc02836c8a77c693c6f9916fb2 (patch) | |
tree | ff873f6e1c351c7e1753e4e01ad7cbf1dde96337 /tools/perf | |
parent | 91aba0a62e24ff7a567e13e1d88deab711df6f0f (diff) |
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>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/builtin-top.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 21db76d71ddf..ca5ca37980fb 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -1040,7 +1040,7 @@ parse_percent_limit(const struct option *opt, const char *arg, | |||
1040 | 1040 | ||
1041 | int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) | 1041 | int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) |
1042 | { | 1042 | { |
1043 | int status; | 1043 | int status = -1; |
1044 | char errbuf[BUFSIZ]; | 1044 | char errbuf[BUFSIZ]; |
1045 | struct perf_top top = { | 1045 | struct perf_top top = { |
1046 | .count_filter = 5, | 1046 | .count_filter = 5, |
@@ -1159,8 +1159,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) | |||
1159 | if (sort_order == default_sort_order) | 1159 | if (sort_order == default_sort_order) |
1160 | sort_order = "dso,symbol"; | 1160 | sort_order = "dso,symbol"; |
1161 | 1161 | ||
1162 | if (setup_sorting() < 0) | 1162 | if (setup_sorting() < 0) { |
1163 | usage_with_options(top_usage, options); | 1163 | parse_options_usage(top_usage, options, "s", 1); |
1164 | goto out_delete_evlist; | ||
1165 | } | ||
1164 | 1166 | ||
1165 | /* display thread wants entries to be collapsed in a different tree */ | 1167 | /* display thread wants entries to be collapsed in a different tree */ |
1166 | sort__need_collapse = 1; | 1168 | sort__need_collapse = 1; |