Em Mon, Jan 10, 2022 at 04:02:49PM -0300, Arnaldo Carvalho de Melo escreveu:
Em Tue, Jan 04, 2022 at 10:13:20PM -0800, Ian Rogers escreveu:
Switch the remaining few users of cpu_map__cpu to perf_cpu_map__cpu and remove the function.
Reviewed-by: James Clark james.clark@arm.com Signed-off-by: Ian Rogers irogers@google.com
util/bpf_ftrace.c: In function ‘perf_ftrace__latency_prepare_bpf’: util/bpf_ftrace.c:66:31: error: implicit declaration of function ‘cpu_map__cpu’; did you mean ‘cpu_map__has’? [-Werror=implicit-function-declaration] 66 | cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); | ^~~~~~~~~~~~ | cpu_map__has cc1: all warnings being treated as errors make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf_ftrace.o] Error 1 make[4]: *** Waiting for unfinished jobs.... LD /tmp/build/perf/ui/browsers/perf-in.o LD /tmp/build/perf/ui/perf-in.o LD /tmp/build/perf/util/scripting-engines/perf-in.o make[3]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:665: /tmp/build/perf/perf-in.o] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile.perf:240: sub-make] Error 2 make: *** [Makefile:113: install-bin] Error 2 make: Leaving directory '/var/home/acme/git/perf/tools/perf'
Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin':
163,635,422,196 cycles:u 213,602,262,800 instructions:u # 1.31 insn per cycle
3.804738555 seconds time elapsed 40.622581000 seconds user 6.589980000 seconds sys⬢[acme@toolbox perf]$ git log --oneline -1 dfe103e757aeff79 (HEAD) perf cpumap: Remove cpu_map__cpu, use libperf function.
This is the first breakage, trying to fix now.
⬢[acme@toolbox perf]$ find tools/perf/ -name "*.c" | xargs grep -w cpu_map__cpu tools/perf/util/bpf_ftrace.c: cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); ⬢[acme@toolbox perf]$
Only this one remaining, so just moving to perf_cpu_map__cpu() like done elsewhere in this patch.
- Arnaldo