perf parse-events: Allow config on kernel PMU events

[linux-2.6-microblaze.git] / tools / perf / util / parse-events.c

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 89494b6..006a7f7 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1673,44 +1673,50 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 }
 
 int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
-                              char *str, struct list_head **listp)
+                              char *str, struct list_head *head,
+                              struct list_head **listp)
 {
        struct parse_events_term *term;
-       struct list_head *list;
+       struct list_head *list = NULL;
        struct perf_pmu *pmu = NULL;
        int ok = 0;
+       char *config;
 
        *listp = NULL;
+
+       if (!head) {
+               head = malloc(sizeof(struct list_head));
+               if (!head)
+                       goto out_err;
+
+               INIT_LIST_HEAD(head);
+       }
+       config = strdup(str);
+       if (!config)
+               goto out_err;
+
+       if (parse_events_term__num(&term,
+                                  PARSE_EVENTS__TERM_TYPE_USER,
+                                  config, 1, false, &config,
+                                       NULL) < 0) {
+               free(config);
+               goto out_err;
+       }
+       list_add_tail(&term->list, head);
+
+
        /* Add it for all PMUs that support the alias */
        list = malloc(sizeof(struct list_head));
        if (!list)
-               return -1;
+               goto out_err;
+
        INIT_LIST_HEAD(list);
+
        while ((pmu = perf_pmu__scan(pmu)) != NULL) {
                struct perf_pmu_alias *alias;
 
                list_for_each_entry(alias, &pmu->aliases, list) {
                        if (!strcasecmp(alias->name, str)) {
-                               struct list_head *head;
-                               char *config;
-
-                               head = malloc(sizeof(struct list_head));
-                               if (!head)
-                                       return -1;
-                               INIT_LIST_HEAD(head);
-                               config = strdup(str);
-                               if (!config)
-                                       return -1;
-                               if (parse_events_term__num(&term,
-                                                  PARSE_EVENTS__TERM_TYPE_USER,
-                                                  config, 1, false, &config,
-                                                  NULL) < 0) {
-                                       free(list);
-                                       free(config);
-                                       return -1;
-                               }
-                               list_add_tail(&term->list, head);
-
                                if (!parse_events_add_pmu(parse_state, list,
                                                          pmu->name, head,
                                                          true, true)) {
@@ -1718,17 +1724,17 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
                                                 pmu->name, alias->str);
                                        ok++;
                                }
-
-                               parse_events_terms__delete(head);
                        }
                }
        }
-       if (!ok) {
+out_err:
+       if (ok)
+               *listp = list;
+       else
                free(list);
-               return -1;
-       }
-       *listp = list;
-       return 0;
+
+       parse_events_terms__delete(head);
+       return ok ? 0 : -1;
 }
 
 int parse_events__modifier_group(struct list_head *list,