diff options
author | Jiri Olsa <jolsa@kernel.org> | 2016-01-07 04:14:04 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-01-08 10:46:17 -0500 |
commit | cbd08b7335c9d559f424dcef7bea333605597490 (patch) | |
tree | 84f0e37fd70a9de25446fb330cd310ebf9b77c30 /tools | |
parent | 1e9abf8b03c8f9352f54171647296c41317679a4 (diff) |
perf tools: Do not show trace command if it's not compiled in
The trace command still appears in help message when you run simple
'perf' command.
It's because the generate-cmdlist.sh does not care about the
HAVE_LIBAUDIT_SUPPORT dependency of trace command and puts it into
generated common_cmds array.
Wrapping trace command under HAVE_LIBAUDIT_SUPPORT dependency, which
will exclude it from common_cmds array if HAVE_LIBAUDIT_SUPPORT is not
set.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Noel Grandin <noelgrandin@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1452158050-28061-8-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/command-list.txt | 2 | ||||
-rwxr-xr-x | tools/perf/util/generate-cmdlist.sh | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt index acc3ea7d90b7..ab5cbaa170d0 100644 --- a/tools/perf/command-list.txt +++ b/tools/perf/command-list.txt | |||
@@ -26,4 +26,4 @@ perf-stat mainporcelain common | |||
26 | perf-test mainporcelain common | 26 | perf-test mainporcelain common |
27 | perf-timechart mainporcelain common | 27 | perf-timechart mainporcelain common |
28 | perf-top mainporcelain common | 28 | perf-top mainporcelain common |
29 | perf-trace mainporcelain common | 29 | perf-trace mainporcelain audit |
diff --git a/tools/perf/util/generate-cmdlist.sh b/tools/perf/util/generate-cmdlist.sh index 36a885d2cd22..0ac2037c970c 100755 --- a/tools/perf/util/generate-cmdlist.sh +++ b/tools/perf/util/generate-cmdlist.sh | |||
@@ -36,4 +36,19 @@ do | |||
36 | }' "Documentation/perf-$cmd.txt" | 36 | }' "Documentation/perf-$cmd.txt" |
37 | done | 37 | done |
38 | echo "#endif /* HAVE_LIBELF_SUPPORT */" | 38 | echo "#endif /* HAVE_LIBELF_SUPPORT */" |
39 | |||
40 | echo "#ifdef HAVE_LIBAUDIT_SUPPORT" | ||
41 | sed -n -e 's/^perf-\([^ ]*\)[ ].* audit*/\1/p' command-list.txt | | ||
42 | sort | | ||
43 | while read cmd | ||
44 | do | ||
45 | sed -n ' | ||
46 | /^NAME/,/perf-'"$cmd"'/H | ||
47 | ${ | ||
48 | x | ||
49 | s/.*perf-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/ | ||
50 | p | ||
51 | }' "Documentation/perf-$cmd.txt" | ||
52 | done | ||
53 | echo "#endif /* HAVE_LIBELF_SUPPORT */" | ||
39 | echo "};" | 54 | echo "};" |