diff options
Diffstat (limited to 'tools/perf/util/mem-events.c')
| -rw-r--r-- | tools/perf/util/mem-events.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 6dda47bb774f..be048bd02f36 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -8,6 +8,7 @@ #include <unistd.h> #include <api/fs/fs.h> #include <linux/kernel.h> +#include "cpumap.h" #include "map_symbol.h" #include "mem-events.h" #include "mem-info.h" @@ -86,7 +87,7 @@ static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu) return NULL; e = &pmu->mem_events[i]; - if (!e) + if (!e || !e->name) return NULL; if (i == PERF_MEM_EVENTS__LOAD || i == PERF_MEM_EVENTS__LOAD_STORE) { @@ -242,6 +243,7 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr) int i = *argv_nr; const char *s; char *copy; + struct perf_cpu_map *cpu_map = NULL; while ((pmu = perf_pmus__scan_mem(pmu)) != NULL) { for (int j = 0; j < PERF_MEM_EVENTS__MAX; j++) { @@ -266,7 +268,19 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr) rec_argv[i++] = "-e"; rec_argv[i++] = copy; + + cpu_map = perf_cpu_map__merge(cpu_map, pmu->cpus); + } + } + + if (cpu_map) { + if (!perf_cpu_map__equal(cpu_map, cpu_map__online())) { + char buf[200]; + + cpu_map__snprint(cpu_map, buf, sizeof(buf)); + pr_warning("Memory events are enabled on a subset of CPUs: %s\n", buf); } + perf_cpu_map__put(cpu_map); } *argv_nr = i; |