perf list: Clean up the printing functions of hardware/software events

Do not need print_events_type or __print_events_type for listing hw/sw
events, let print_symbol_events do its job instead. Moreover,
print_symbol_events can also handle event_glob and name_only.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1425032491-20224-4-git-send-email-yunlong.song@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 2acbcf0b554fffa4e8705db36f5c822075c8b54c..8b323e015458f4e866e1078a36ef2563540e6a9b 100644 (file)
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -54,10 +54,12 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                        print_tracepoint_events(NULL, NULL, false);
                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, false);
                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, false);
                else if (strcmp(argv[i], "cache") == 0 ||
                         strcmp(argv[i], "hwcache") == 0)
                        print_hwcache_events(NULL, false);

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f6822d9b2b53d71f4f0bfd8dc1d71e37e9c02d60..fe07573d5ed456241fc663fa86f12fc01340fe46 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -20,11 +20,6 @@
 
 #define MAX_NAME_LEN 100
 
-struct event_symbol {
-       const char      *symbol;
-       const char      *alias;
-};
-
 #ifdef PARSER_DEBUG
 extern int parse_events_debug;
 #endif
@@ -39,7 +34,7 @@ static struct perf_pmu_event_symbol *perf_pmu_events_list;
  */
 static int perf_pmu_events_list_num;
 
-static struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {
+struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {
        [PERF_COUNT_HW_CPU_CYCLES] = {
                .symbol = "cpu-cycles",
                .alias  = "cycles",
@@ -82,7 +77,7 @@ static struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {
        },
 };
 
-static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {
+struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {
        [PERF_COUNT_SW_CPU_CLOCK] = {
                .symbol = "cpu-clock",
                .alias  = "",
@@ -1269,75 +1264,6 @@ static bool is_event_supported(u8 type, unsigned config)
        return ret;
 }
 
-static void __print_events_type(u8 type, struct event_symbol *syms,
-                               unsigned max)
-{
-       char name[64];
-       unsigned int i, evt_i = 0, evt_num = 0;
-       char **evt_list = NULL;
-       bool evt_num_known = false;
-
-restart:
-       if (evt_num_known) {
-               evt_list = zalloc(sizeof(char *) * evt_num);
-               if (!evt_list)
-                       goto out_enomem;
-               syms -= max;
-       }
-
-       for (i = 0; i < max ; i++, syms++) {
-               if (!is_event_supported(type, i))
-                       continue;
-
-               if (!evt_num_known) {
-                       evt_num++;
-                       continue;
-               }
-
-               if (strlen(syms->alias))
-                       snprintf(name, sizeof(name),  "%s OR %s",
-                                syms->symbol, syms->alias);
-               else
-                       snprintf(name, sizeof(name), "%s", syms->symbol);
-
-               evt_list[evt_i] = strdup(name);
-               if (evt_list[evt_i] == NULL)
-                       goto out_enomem;
-               evt_i++;
-       }
-
-       if (!evt_num_known) {
-               evt_num_known = true;
-               goto restart;
-       }
-       qsort(evt_list, evt_num, sizeof(char *), cmp_string);
-       evt_i = 0;
-       while (evt_i < evt_num)
-               printf("  %-50s [%s]\n", evt_list[evt_i++], event_type_descriptors[type]);
-       if (evt_num)
-               printf("\n");
-
-out_free:
-       evt_num = evt_i;
-       for (evt_i = 0; evt_i < evt_num; evt_i++)
-               zfree(&evt_list[evt_i]);
-       zfree(&evt_list);
-       return;
-
-out_enomem:
-       printf("FATAL: not enough memory to print %s\n", event_type_descriptors[type]);
-       if (evt_list)
-               goto out_free;
-}
-
-void print_events_type(u8 type)
-{
-       if (type == PERF_TYPE_SOFTWARE)
-               __print_events_type(type, event_symbols_sw, PERF_COUNT_SW_MAX);
-       else
-               __print_events_type(type, event_symbols_hw, PERF_COUNT_HW_MAX);
-}
-
 int print_hwcache_events(const char *event_glob, bool name_only)
 {
        unsigned int type, op, i, evt_i = 0, evt_num = 0;
@@ -1412,7 +1338,7 @@ out_enomem:
        return evt_num;
 }
 
-static void print_symbol_events(const char *event_glob, unsigned type,
+void print_symbol_events(const char *event_glob, unsigned type,
                                struct event_symbol *syms, unsigned max,
                                bool name_only)
 {

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 39c3b57965d185e8c17faee087e8620d723a5513..52a2dda4f954a7682d43376bd3ac2ee91d127447 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -116,7 +116,16 @@ void parse_events_update_lists(struct list_head *list_event,
 void parse_events_error(void *data, void *scanner, char const *msg);
 
 void print_events(const char *event_glob, bool name_only);
-void print_events_type(u8 type);
+
+struct event_symbol {
+       const char      *symbol;
+       const char      *alias;
+};
+extern struct event_symbol event_symbols_hw[];
+extern struct event_symbol event_symbols_sw[];
+void print_symbol_events(const char *event_glob, unsigned type,
+                               struct event_symbol *syms, unsigned max,
+                               bool name_only);
 void print_tracepoint_events(const char *subsys_glob, const char *event_glob,
                             bool name_only);
 int print_hwcache_events(const char *event_glob, bool name_only);