Re: [PATCH V2 08/23] libperf evlist: Add evsel as a parameter to ->idx()

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

Em Fri, May 06, 2022 at 03:25:46PM +0300, Adrian Hunter escreveu:
> Add evsel as a parameter to ->idx() in preparation for correctly
> determining whether an auxtrace mmap is 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 | 2 +-
> tools/lib/perf/include/internal/evlist.h | 3 ++-
> tools/perf/util/evlist.c | 1 +
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c
> index 4fce417432aa..ed66f2e38464 100644
> --- a/tools/lib/perf/evlist.c
> +++ b/tools/lib/perf/evlist.c
> @@ -479,7 +479,7 @@ 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);
> + ops->idx(evlist, evsel, mp, idx);
>
> if (ops->mmap(map, mp, *output, evlist_cpu) < 0)
> return -1;
> diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h
> index 0d5c830431a7..6f89aec3e608 100644
> --- a/tools/lib/perf/include/internal/evlist.h
> +++ b/tools/lib/perf/include/internal/evlist.h
> @@ -38,7 +38,8 @@ struct perf_evlist {
> };
>
> typedef void
> -(*perf_evlist_mmap__cb_idx_t)(struct perf_evlist*, struct perf_mmap_param*, int);
> +(*perf_evlist_mmap__cb_idx_t)(struct perf_evlist*, struct perf_evsel*,
> + 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 09a1d3400fd9..7ae56b062f44 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -747,6 +747,7 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
>
> static void
> perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist,
> + struct perf_evsel *_evsel __maybe_unused,
> struct perf_mmap_param *_mp,
> int idx)
> {
> --
> 2.25.1

--

- Arnaldo