libperf evlist: Move ->idx() into mmap_per_evsel()

Move ->idx() into mmap_per_evsel() in preparation for adding evsel as a
parameter.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20220506122601.367589-8-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c
index 5e8ad854fa8a3c2fd4de1be5bcd1054583c715a1..4fce417432aad6902b97fe74c02efdf5967d860f 100644 (file)
--- a/tools/lib/perf/evlist.c
+++ b/tools/lib/perf/evlist.c
@@ -478,6 +478,9 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
                         */
                        refcount_set(&map->refcnt, 2);
 
+                       if (ops->idx)
+                               ops->idx(evlist, mp, idx);
+
                        if (ops->mmap(map, mp, *output, evlist_cpu) < 0)
                                return -1;
 
@@ -520,9 +523,6 @@ mmap_per_thread(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
                int output = -1;
                int output_overwrite = -1;
 
-               if (ops->idx)
-                       ops->idx(evlist, mp, thread);
-
                if (mmap_per_evsel(evlist, ops, thread, mp, 0, thread,
                                   &output, &output_overwrite))
                        goto out_unmap;
@@ -547,9 +547,6 @@ mmap_per_cpu(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
                int output = -1;
                int output_overwrite = -1;
 
-               if (ops->idx)
-                       ops->idx(evlist, mp, cpu);
-
                for (thread = 0; thread < nr_threads; thread++) {
                        if (mmap_per_evsel(evlist, ops, cpu, mp, cpu,
                                           thread, &output, &output_overwrite))