Commit b3e9e86b authored Jun 30, 2023 by Adrian Hunter Committed by Junhao He Jun 30, 2023

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

mainline inclusion
from mainline-v5.19-rc1
commit d8fe2efb
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7HI80
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d8fe2efb65acdc213eb180b7853fc1121c1bff37



--------------------------------

Remove ->idx() per_cpu parameter because it isn't needed.
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>
Signed-off-by: Junhao He <hejunhao3@huawei.com>

parent 25912eca

tools/lib/perf/evlist.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -468,6 +468,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;

		@@ -510,9 +513,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;
		@@ -537,9 +537,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))