From: David Ahern <[email protected]>

Currently 'perf list' is not very helpful if you forget the syntax:

  $ perf list -h

  List of pre-defined events (to be used in -e):

After:
  $ perf list -h

   usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]

Signed-off-by: David Ahern <[email protected]>
Acked-by: Ingo Molnar <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/builtin-list.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 45000e7d4398..011195e38f21 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -14,20 +14,31 @@
 #include "util/parse-events.h"
 #include "util/cache.h"
 #include "util/pmu.h"
+#include "util/parse-options.h"
 
 int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 {
        int i;
+       const struct option list_options[] = {
+               OPT_END()
+       };
+       const char * const list_usage[] = {
+               "perf list [hw|sw|cache|tracepoint|pmu|event_glob]",
+               NULL
+       };
+
+       argc = parse_options(argc, argv, list_options, list_usage,
+                            PARSE_OPT_STOP_AT_NON_OPTION);
 
        setup_pager();
 
-       if (argc == 1) {
+       if (argc == 0) {
                print_events(NULL, false);
                return 0;
        }
 
-       for (i = 1; i < argc; ++i) {
-               if (i > 2)
+       for (i = 0; i < argc; ++i) {
+               if (i)
                        putchar('\n');
                if (strncmp(argv[i], "tracepoint", 10) == 0)
                        print_tracepoint_events(NULL, NULL, false);
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to