libperf evlist: Remove ->idx() per_cpu parameter

Remove ->idx() per_cpu parameter because it isn't needed.

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-7-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 974b4585f93ee668759be482dc4ff1cea45ad77b..5e8ad854fa8a3c2fd4de1be5bcd1054583c715a1 100644 (file)
--- a/tools/lib/perf/evlist.c
+++ b/tools/lib/perf/evlist.c
@@ -521,7 +521,7 @@ mmap_per_thread(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
                int output_overwrite = -1;
 
                if (ops->idx)
-                       ops->idx(evlist, mp, thread, false);
+                       ops->idx(evlist, mp, thread);
 
                if (mmap_per_evsel(evlist, ops, thread, mp, 0, thread,
                                   &output, &output_overwrite))
@@ -548,7 +548,7 @@ mmap_per_cpu(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
                int output_overwrite = -1;
 
                if (ops->idx)
-                       ops->idx(evlist, mp, cpu, true);
+                       ops->idx(evlist, mp, cpu);
 
                for (thread = 0; thread < nr_threads; thread++) {
                        if (mmap_per_evsel(evlist, ops, cpu, mp, cpu,

diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h
index e3e64f37db7ba4319c7a8f8c6337b449dc0168fa..0d5c830431a75a1f24f439b3b598a6d0bf4c87fc 100644 (file)
--- a/tools/lib/perf/include/internal/evlist.h
+++ b/tools/lib/perf/include/internal/evlist.h
@@ -38,7 +38,7 @@ struct perf_evlist {
 };
 
 typedef void
-(*perf_evlist_mmap__cb_idx_t)(struct perf_evlist*, struct perf_mmap_param*, int, bool);
+(*perf_evlist_mmap__cb_idx_t)(struct perf_evlist*, struct perf_mmap_param*, int);
 typedef struct perf_mmap*
 (*perf_evlist_mmap__cb_get_t)(struct perf_evlist*, bool, int);
 typedef int

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index f1309b39afe4d8ae15528747a02d9e6ce45cb2db..09a1d3400fd98f70d82d95fffdd7113111127b70 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -748,10 +748,11 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
 static void
 perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist,
                         struct perf_mmap_param *_mp,
-                        int idx, bool per_cpu)
+                        int idx)
 {
        struct evlist *evlist = container_of(_evlist, struct evlist, core);
        struct mmap_params *mp = container_of(_mp, struct mmap_params, core);
+       bool per_cpu = !perf_cpu_map__empty(_evlist->user_requested_cpus);
 
        auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, idx, per_cpu);
 }