Skip to content

Commit

Permalink
perf/scripts: Fix supported language listing option
Browse files Browse the repository at this point in the history
'perf trace -s list' prints a list of the supported scripting
languages.  One problem with it is that it falls through and prints
the trace as well.  The use of 'list' for this also makes it easy to
confuse with 'perf trace -l', used for listing available scripts.  So
change 'perf trace -s list' to 'perf trace -s lang' and fixes the
fall-through problem.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Keiichi KII <k-keiichi@bx.jp.nec.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1264580883-15324-2-git-send-email-tzanussi@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
  • Loading branch information
Tom Zanussi authored and Frederic Weisbecker committed Feb 23, 2010
1 parent faa5c5c commit f526d68
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion tools/perf/Documentation/perf-trace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ OPTIONS
--list=::
Display a list of available trace scripts.

-s::
-s ['lang']::
--script=::
Process trace data with the given script ([lang]:script[.ext]).
If the string 'lang' is specified in place of a script name, a
list of supported languages will be displayed instead.

-g::
--gen-script=::
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ static int parse_scriptname(const struct option *opt __used,
const char *script, *ext;
int len;

if (strcmp(str, "list") == 0) {
if (strcmp(str, "lang") == 0) {
list_available_languages();
return 0;
exit(0);
}

script = strchr(str, ':');
Expand Down

0 comments on commit f526d68

Please sign in to comment.