Re: [PATCH V2 11/23] perf auxtrace: Remove auxtrace_mmap_params__set_idx() per_cpu parameter

Ian Rogers
2022-05-06T20:19:30Z

On Fri, May 6, 2022 at 5:26 AM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> Remove auxtrace_mmap_params__set_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>

Thanks,
Ian

> ---
> tools/perf/util/auxtrace.c | 5 +++--
> tools/perf/util/auxtrace.h | 6 ++----
> tools/perf/util/evlist.c | 3 +--
> tools/perf/util/mmap.c | 3 +--
> 4 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index b446cfa66469..ac4e4660932d 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -169,9 +169,10 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
>
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> struct evlist *evlist,
> - struct evsel *evsel, int idx,
> - bool per_cpu)
> + struct evsel *evsel, int idx)
> {
> + bool per_cpu = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
> +
> mp->mmap_needed = evsel->needs_auxtrace_mmap;
>
> if (!mp->mmap_needed)
> diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
> index 37feae003904..87a3b564a7de 100644
> --- a/tools/perf/util/auxtrace.h
> +++ b/tools/perf/util/auxtrace.h
> @@ -493,8 +493,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
> bool auxtrace_overwrite);
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> struct evlist *evlist,
> - struct evsel *evsel, int idx,
> - bool per_cpu);
> + struct evsel *evsel, int idx);
>
> typedef int (*process_auxtrace_t)(struct perf_tool *tool,
> struct mmap *map,
> @@ -867,8 +866,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
> bool auxtrace_overwrite);
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> struct evlist *evlist,
> - struct evsel *evsel, int idx,
> - bool per_cpu);
> + struct evsel *evsel, int idx);
>
> #define ITRACE_HELP ""
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 996bdc203616..25eae096bdac 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -753,10 +753,9 @@ perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist,
> {
> 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);
> struct evsel *evsel = container_of(_evsel, struct evsel, core);
>
> - auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx, per_cpu);
> + auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx);
> }
>
> static struct perf_mmap*
> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
> index de59c4da852b..a4dff881be39 100644
> --- a/tools/perf/util/mmap.c
> +++ b/tools/perf/util/mmap.c
> @@ -63,8 +63,7 @@ void __weak auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp __maybe_u
> void __weak auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp __maybe_unused,
> struct evlist *evlist __maybe_unused,
> struct evsel *evsel __maybe_unused,
> - int idx __maybe_unused,
> - bool per_cpu __maybe_unused)
> + int idx __maybe_unused)
> {
> }
>
> --
> 2.25.1
>