Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / builtin-mem.c

diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index cdd2b9f..0fd2a74 100644 (file)
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -18,6 +18,8 @@
 #include "util/dso.h"
 #include "util/map.h"
 #include "util/symbol.h"
+#include "util/pmu.h"
+#include "util/pmu-hybrid.h"
 #include <linux/err.h>
 
 #define MEM_OPERATION_LOAD     0x1
@@ -62,8 +64,10 @@ static const char * const *record_mem_usage = __usage;
 
 static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
 {
-       int rec_argc, i = 0, j;
+       int rec_argc, i = 0, j, tmp_nr = 0;
+       int start, end;
        const char **rec_argv;
+       char **rec_tmp;
        int ret;
        bool all_user = false, all_kernel = false;
        struct perf_mem_event *e;
@@ -87,11 +91,24 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
        argc = parse_options(argc, argv, options, record_mem_usage,
                             PARSE_OPT_KEEP_UNKNOWN);
 
-       rec_argc = argc + 9; /* max number of arguments */
+       if (!perf_pmu__has_hybrid())
+               rec_argc = argc + 9; /* max number of arguments */
+       else
+               rec_argc = argc + 9 * perf_pmu__hybrid_pmu_num();
+
        rec_argv = calloc(rec_argc + 1, sizeof(char *));
        if (!rec_argv)
                return -1;
 
+       /*
+        * Save the allocated event name strings.
+        */
+       rec_tmp = calloc(rec_argc + 1, sizeof(char *));
+       if (!rec_tmp) {
+               free(rec_argv);
+               return -1;
+       }
+
        rec_argv[i++] = "record";
 
        e = perf_mem_events__ptr(PERF_MEM_EVENTS__LOAD_STORE);
@@ -128,21 +145,11 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
        if (mem->data_page_size)
                rec_argv[i++] = "--data-page-size";
 
-       for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
-               e = perf_mem_events__ptr(j);
-               if (!e->record)
-                       continue;
-
-               if (!e->supported) {
-                       pr_err("failed: event '%s' not supported\n",
-                              perf_mem_events__name(j));
-                       free(rec_argv);
-                       return -1;
-               }
-
-               rec_argv[i++] = "-e";
-               rec_argv[i++] = perf_mem_events__name(j);
-       }
+       start = i;
+       ret = perf_mem_events__record_args(rec_argv, &i, rec_tmp, &tmp_nr);
+       if (ret)
+               goto out;
+       end = i;
 
        if (all_user)
                rec_argv[i++] = "--all-user";
@@ -156,14 +163,18 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
        if (verbose > 0) {
                pr_debug("calling: record ");
 
-               while (rec_argv[j]) {
+               for (j = start; j < end; j++)
                        pr_debug("%s ", rec_argv[j]);
-                       j++;
-               }
+
                pr_debug("\n");
        }
 
        ret = cmd_record(i, rec_argv);
+out:
+       for (i = 0; i < tmp_nr; i++)
+               free(rec_tmp[i]);
+
+       free(rec_tmp);
        free(rec_argv);
        return ret;
 }