Re: [PATCH V2 06/23] libperf evlist: Remove ->idx() per_cpu parameter

Arnaldo Carvalho de Melo
2022-05-10T17:27:31Z

Em Fri, May 06, 2022 at 03:25:44PM +0300, Adrian Hunter escreveu:
> Remove ->idx() per_cpu parameter because it isn't needed.
>
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Thanks, applied.

- Arnaldo

> ---
> tools/lib/perf/evlist.c | 4 ++--
> tools/lib/perf/include/internal/evlist.h | 2 +-
> tools/perf/util/evlist.c | 3 ++-
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c
> index 974b4585f93e..5e8ad854fa8a 100644
> --- 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 e3e64f37db7b..0d5c830431a7 100644
> --- 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 f1309b39afe4..09a1d3400fd9 100644
> --- 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);
> }
> --
> 2.25.1

--

- Arnaldo