Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 9bb79e0..52ea004 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -440,7 +440,7 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name)
        bool has_imm = false;
 
        // See explanation in evlist__close()
-       if (!cpu_map__is_dummy(evlist->core.cpus)) {
+       if (!cpu_map__is_dummy(evlist->core.user_requested_cpus)) {
                if (affinity__setup(&saved_affinity) < 0)
                        return;
                affinity = &saved_affinity;
@@ -500,7 +500,7 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name)
        struct affinity saved_affinity, *affinity = NULL;
 
        // See explanation in evlist__close()
-       if (!cpu_map__is_dummy(evlist->core.cpus)) {
+       if (!cpu_map__is_dummy(evlist->core.user_requested_cpus)) {
                if (affinity__setup(&saved_affinity) < 0)
                        return;
                affinity = &saved_affinity;
@@ -565,7 +565,7 @@ static int evlist__enable_event_cpu(struct evlist *evlist, struct evsel *evsel,
 static int evlist__enable_event_thread(struct evlist *evlist, struct evsel *evsel, int thread)
 {
        int cpu;
-       int nr_cpus = perf_cpu_map__nr(evlist->core.cpus);
+       int nr_cpus = perf_cpu_map__nr(evlist->core.user_requested_cpus);
 
        if (!evsel->core.fd)
                return -EINVAL;
@@ -580,7 +580,7 @@ static int evlist__enable_event_thread(struct evlist *evlist, struct evsel *evse
 
 int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx)
 {
-       bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.cpus);
+       bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
 
        if (per_cpu_mmaps)
                return evlist__enable_event_cpu(evlist, evsel, idx);
@@ -1301,10 +1301,11 @@ void evlist__close(struct evlist *evlist)
        struct affinity affinity;
 
        /*
-        * With perf record core.cpus is usually NULL.
+        * With perf record core.user_requested_cpus is usually NULL.
         * Use the old method to handle this for now.
         */
-       if (!evlist->core.cpus || cpu_map__is_dummy(evlist->core.cpus)) {
+       if (!evlist->core.user_requested_cpus ||
+           cpu_map__is_dummy(evlist->core.user_requested_cpus)) {
                evlist__for_each_entry_reverse(evlist, evsel)
                        evsel__close(evsel);
                return;
@@ -1330,7 +1331,6 @@ static int evlist__create_syswide_maps(struct evlist *evlist)
 {
        struct perf_cpu_map *cpus;
        struct perf_thread_map *threads;
-       int err = -ENOMEM;
 
        /*
         * Try reading /sys/devices/system/cpu/online to get
@@ -1355,7 +1355,7 @@ static int evlist__create_syswide_maps(struct evlist *evlist)
 out_put:
        perf_cpu_map__put(cpus);
 out:
-       return err;
+       return -ENOMEM;
 }
 
 int evlist__open(struct evlist *evlist)
@@ -1367,7 +1367,7 @@ int evlist__open(struct evlist *evlist)
         * Default: one fd per CPU, all threads, aka systemwide
         * as sys_perf_event_open(cpu = -1, thread = -1) is EINVAL
         */
-       if (evlist->core.threads == NULL && evlist->core.cpus == NULL) {
+       if (evlist->core.threads == NULL && evlist->core.user_requested_cpus == NULL) {
                err = evlist__create_syswide_maps(evlist);
                if (err < 0)
                        goto out_err;