perf evsel: Rename CPU around get_group_fd

CPU is really a cpu map index, change names to make code more intention
revealing.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: zhengjun.xing@intel.com
Link: https://lore.kernel.org/r/20220105061351.120843-38-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 8f539a81b30bde51ce550cb4ea4d1172e0fbdf04..45338be3f501c3c510f1dbadb6fc923fe9b511d0 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1591,27 +1591,27 @@ int __evsel__read_on_cpu(struct evsel *evsel, int cpu_map_idx, int thread, bool
 }
 
 static int evsel__match_other_cpu(struct evsel *evsel, struct evsel *other,
-                                 int cpu)
+                                 int cpu_map_idx)
 {
-       int cpuid;
+       int cpu;
 
-       cpuid = perf_cpu_map__cpu(evsel->core.cpus, cpu);
-       return perf_cpu_map__idx(other->core.cpus, cpuid);
+       cpu = perf_cpu_map__cpu(evsel->core.cpus, cpu_map_idx);
+       return perf_cpu_map__idx(other->core.cpus, cpu);
 }
 
-static int evsel__hybrid_group_cpu(struct evsel *evsel, int cpu)
+static int evsel__hybrid_group_cpu_map_idx(struct evsel *evsel, int cpu_map_idx)
 {
        struct evsel *leader = evsel__leader(evsel);
 
        if ((evsel__is_hybrid(evsel) && !evsel__is_hybrid(leader)) ||
            (!evsel__is_hybrid(evsel) && evsel__is_hybrid(leader))) {
-               return evsel__match_other_cpu(evsel, leader, cpu);
+               return evsel__match_other_cpu(evsel, leader, cpu_map_idx);
        }
 
-       return cpu;
+       return cpu_map_idx;
 }
 
-static int get_group_fd(struct evsel *evsel, int cpu, int thread)
+static int get_group_fd(struct evsel *evsel, int cpu_map_idx, int thread)
 {
        struct evsel *leader = evsel__leader(evsel);
        int fd;
@@ -1625,11 +1625,11 @@ static int get_group_fd(struct evsel *evsel, int cpu, int thread)
         */
        BUG_ON(!leader->core.fd);
 
-       cpu = evsel__hybrid_group_cpu(evsel, cpu);
-       if (cpu == -1)
+       cpu_map_idx = evsel__hybrid_group_cpu_map_idx(evsel, cpu_map_idx);
+       if (cpu_map_idx == -1)
                return -1;
 
-       fd = FD(leader, cpu, thread);
+       fd = FD(leader, cpu_map_idx, thread);
        BUG_ON(fd == -1);
 
        return fd;