Merge tag 'for-linus-4.3-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-list.c

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 198f3c3aff952358766626f5bfea9ce81a996b28..af5bd05141088469d29d2fc7112927be96f2f610 100644 (file)
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -36,38 +36,36 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 
        setup_pager();
 
-       if (raw_dump) {
-               print_events(NULL, true);
-               return 0;
-       }
+       if (!raw_dump)
+               printf("\nList of pre-defined events (to be used in -e):\n\n");
 
        if (argc == 0) {
-               print_events(NULL, false);
+               print_events(NULL, raw_dump);
                return 0;
        }
 
        for (i = 0; i < argc; ++i) {
-               if (i)
-                       putchar('\n');
-               if (strncmp(argv[i], "tracepoint", 10) == 0)
-                       print_tracepoint_events(NULL, NULL, false);
+               if (strcmp(argv[i], "tracepoint") == 0)
+                       print_tracepoint_events(NULL, NULL, raw_dump);
                else if (strcmp(argv[i], "hw") == 0 ||
                         strcmp(argv[i], "hardware") == 0)
-                       print_events_type(PERF_TYPE_HARDWARE);
+                       print_symbol_events(NULL, PERF_TYPE_HARDWARE,
+                                       event_symbols_hw, PERF_COUNT_HW_MAX, raw_dump);
                else if (strcmp(argv[i], "sw") == 0 ||
                         strcmp(argv[i], "software") == 0)
-                       print_events_type(PERF_TYPE_SOFTWARE);
+                       print_symbol_events(NULL, PERF_TYPE_SOFTWARE,
+                                       event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);
                else if (strcmp(argv[i], "cache") == 0 ||
                         strcmp(argv[i], "hwcache") == 0)
-                       print_hwcache_events(NULL, false);
+                       print_hwcache_events(NULL, raw_dump);
                else if (strcmp(argv[i], "pmu") == 0)
-                       print_pmu_events(NULL, false);
+                       print_pmu_events(NULL, raw_dump);
                else {
                        char *sep = strchr(argv[i], ':'), *s;
                        int sep_idx;
 
                        if (sep == NULL) {
-                               print_events(argv[i], false);
+                               print_events(argv[i], raw_dump);
                                continue;
                        }
                        sep_idx = sep - argv[i];
@@ -76,7 +74,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                                return -1;
 
                        s[sep_idx] = '\0';
-                       print_tracepoint_events(s, s + sep_idx + 1, false);
+                       print_tracepoint_events(s, s + sep_idx + 1, raw_dump);
                        free(s);
                }
        }