perf/core improvements and fixes
Subsystems (4)
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling,
Best regards,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit b3c303be4c35856945cb17ec639b94637447dae2:
Merge tag 'perf-urgent-for-mingo-5.3-20190729' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2019-07-29 23:24:07 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-5.4-20190729
for you to fetch changes up to 123a039d0d54de6d5bafd551e7aa17569e13e315:
perf vendor events power9: Added missing event descriptions (2019-07-29 18:34:47 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
perf trace:
Arnaldo Carvalho de Melo:
- Use BPF_MAP_TYPE_PROG_ARRAY + bpf_tail_call() for augmenting raw syscalls, i.e. copy pointers passed to/from userspace. The use of a table per syscall to tell the BPF program what to copy made the raw_syscalls:sys_enter/exit programs a bit complex, the scratch space would have to be bigger to allow for checking all args to see which ones were a pathname, so use a PROG_ARRAY map instead, test it with syscalls that receive multiple pathnames at different pairs of arguments (rename, renameat, etc).
- Beautify various syscalls using this new infrastructure, and also add code that looks for syscalls with BPF augmenters, such as "open", and then reuse it with syscalls not yet having a specific augmenter, but that copies the same argument with the same type, say "statfs" can initially reuse "open", beautifier, as both have as its first arg a "const char *".
- Do not using fd->pathname beautifier when the 'close' syscall isn't enabled, as we can't invalidate that mapping.
core:
Jiri Olsa:
- Introduce tools/perf/lib/, that eventually will move to tools/lib/perf/, to allow other tools to use the abstractions and code perf uses to set up the perf ring buffer and set up the many possible combinations in allowed by the kernel, starting with 'struct perf_evsel' and 'struct perf_evlist'.
perf vendor events:
Michael Petlan:
- Add missing event description to power9 event definitions.
----------------------------------------------------------------
Arnaldo Carvalho de Melo (27):
perf include bpf: Add bpf_tail_call() prototype
perf bpf: Do not attach a BPF prog to a tracepoint if its name starts with ! perf evsel: Store backpointer to attached bpf_object
perf trace: Add pointer to BPF object containing __augmented_syscalls__ perf trace: Look up maps just on the __augmented_syscalls__ BPF object perf trace: Order -e syscalls table
perf trace: Add BPF handler for unaugmented syscalls
perf trace: Allow specifying the bpf prog to augment specific syscalls perf trace: Put the per-syscall entry/exit prog_array BPF map infrastructure in place perf trace: Handle raw_syscalls:sys_enter just like the BPF_OUTPUT augmented event perf augmented_raw_syscalls: Add handler for "openat"
perf augmented_raw_syscalls: Switch to using BPF_MAP_TYPE_PROG_ARRAY
perf augmented_raw_syscalls: Support copying two string syscall args
perf trace: Look for default name for entries in the syscalls prog array perf augmented_raw_syscalls: Rename augmented_args_filename to augmented_args_payload perf augmented_raw_syscalls: Augment sockaddr arg in 'connect'
perf trace beauty: Make connect's addrlen be printed as an int, not hex perf trace beauty: Disable fd->pathname when close() not enabled
perf trace beauty: Do not try to use the fd->pathname beautifier for bind/connect fd arg perf trace beauty: Beautify 'sendto's sockaddr arg
perf trace beauty: Beautify bind's sockaddr arg
perf trace beauty: Add BPF augmenter for the 'rename' syscall
perf trace: Forward error codes when trying to read syscall info
perf trace: Mark syscall ids that are not allocated to avoid unnecessary error messages perf trace: Preallocate the syscall table
perf trace: Reuse BPF augmenters from syscalls with similar args signature perf trace: Add "sendfile64" alias to the "sendfile" syscall
Jiri Olsa (79):
perf stat: Move loaded out of struct perf_counts_values
perf cpu_map: Rename struct cpu_map to struct perf_cpu_map
perf tools: Rename struct thread_map to struct perf_thread_map perf evsel: Rename struct perf_evsel to struct evsel
perf evlist: Rename struct perf_evlist to struct evlist
perf evsel: Rename perf_evsel__init() to evsel__init()
perf evlist: Rename perf_evlist__init() to evlist__init()
perf evlist: Rename perf_evlist__new() to evlist__new()
perf evlist: Rename perf_evlist__delete() to evlist__delete() perf evsel: Rename perf_evsel__delete() to evsel__delete()
perf evsel: Rename perf_evsel__new() to evsel__new()
perf evlist: Rename perf_evlist__add() to evlist__add()
perf evlist: Rename perf_evlist__remove() to evlist__remove() perf evsel: Rename perf_evsel__open() to evsel__open()
perf evsel: Rename perf_evsel__enable() to evsel__enable()
perf evsel: Rename perf_evsel__disable() to evsel__disable()
perf evsel: Rename perf_evsel__apply_filter() to evsel__apply_filter() perf evsel: Rename perf_evsel__cpus() to evsel__cpus()
perf evlist: Rename perf_evlist__open() to evlist__open()
perf evlist: Rename perf_evlist__close() to evlist__close()
perf evlist: Rename perf_evlist__enable() to evlist__enable() perf evlist: Rename perf_evlist__disable() to evlist__disable()
libperf: Make libperf.a part of the perf build
libperf: Add build version support
libperf: Add libperf to the python.so build
libperf: Add perf/core.h header
libperf: Add debug output support
libperf: Add perf_cpu_map struct
libperf: Add perf_cpu_map__dummy_new() function
libperf: Add perf_cpu_map__get()/perf_cpu_map__put()
libperf: Add perf_thread_map struct
libperf: Add perf_thread_map__new_dummy() function
libperf: Add perf_thread_map__get()/perf_thread_map__put()
libperf: Add perf_evlist and perf_evsel structs
libperf: Include perf_evsel in evsel object
libperf: Include perf_evlist in evlist object
libperf: Add perf_evsel__init function
libperf: Add perf_evlist__init() function
libperf: Add perf_evlist__add() function
libperf: Add perf_evlist__remove() function
libperf: Add nr_entries to struct perf_evlist
libperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel
libperf: Add perf_cpu_map__new()/perf_cpu_map__read() functions
libperf: Move zalloc.o into libperf
libperf: Add perf_evlist__new() function
libperf: Add perf_evsel__new() function
libperf: Add perf_evlist__for_each_evsel() iterator
libperf: Add perf_evlist__delete() function
libperf: Add perf_evsel__delete() function
libperf: Add cpus to struct perf_evsel
libperf: Add own_cpus to struct perf_evsel
libperf: Add threads to struct perf_evsel
libperf: Add has_user_cpus to struct perf_evlist
libperf: Add cpus to struct perf_evlist
libperf: Add threads to struct perf_evlist
libperf: Add perf_evlist__set_maps() function
libperf: Adopt xyarray class from perf
libperf: Move fd array from perf's evsel to lobperf's perf_evsel class
libperf: Move nr_members from perf's evsel to libperf's perf_evsel
libperf: Adopt the readn()/writen() functions from tools/perf
libperf: Adopt perf_evsel__alloc_fd() function from tools/perf
libperf: Adopt simplified perf_evsel__open() function from tools/perf
libperf: Adopt simplified perf_evsel__close() function from tools/perf
libperf: Adopt perf_evsel__read() function from tools/perf
libperf: Adopt perf_evsel__enable()/disable()/apply_filter() functions
libperf: Add perf_cpu_map__for_each_cpu() macro
libperf: Add perf_evsel__cpus()/threads() functions
libperf: Adopt simplified perf_evlist__open()/close() functions from tools/perf
libperf: Adopt perf_evlist__enable()/disable() functions from perf
libperf: Add perf_evsel__attr() function
libperf: Add install targets
libperf: Add tests support
libperf: Add perf_cpu_map test
libperf: Add perf_thread_map test
libperf: Add perf_evlist test
libperf: Add perf_evsel tests
libperf: Add perf_evlist__enable/disable test
libperf: Add perf_evsel__enable/disable test
libperf: Initial documentation
Michael Petlan (1):
perf vendor events power9: Added missing event descriptions
tools/perf/Makefile.config | 1 +
tools/perf/Makefile.perf | 31 +-
tools/perf/arch/arm/util/auxtrace.c | 8 +-
tools/perf/arch/arm/util/cs-etm.c | 82 +-
tools/perf/arch/arm64/util/arm-spe.c | 24 +-
tools/perf/arch/arm64/util/header.c | 6 +-
tools/perf/arch/powerpc/util/kvm-stat.c | 12 +-
tools/perf/arch/s390/util/auxtrace.c | 12 +-
tools/perf/arch/s390/util/kvm-stat.c | 8 +-
tools/perf/arch/x86/tests/intel-cqm.c | 8 +-
tools/perf/arch/x86/tests/perf-time-to-tsc.c | 30 +-
tools/perf/arch/x86/util/auxtrace.c | 10 +-
tools/perf/arch/x86/util/intel-bts.c | 38 +-
tools/perf/arch/x86/util/intel-pt.c | 82 +-
tools/perf/arch/x86/util/kvm-stat.c | 12 +-
tools/perf/bench/epoll-ctl.c | 7 +-
tools/perf/bench/epoll-wait.c | 7 +-
tools/perf/bench/futex-hash.c | 5 +-
tools/perf/bench/futex-lock-pi.c | 7 +-
tools/perf/bench/futex-requeue.c | 7 +-
tools/perf/bench/futex-wake-parallel.c | 6 +-
tools/perf/bench/futex-wake.c | 7 +-
tools/perf/builtin-annotate.c | 16 +-
tools/perf/builtin-c2c.c | 10 +-
tools/perf/builtin-diff.c | 20 +-
tools/perf/builtin-evlist.c | 4 +-
tools/perf/builtin-ftrace.c | 18 +-
tools/perf/builtin-inject.c | 60 +-
tools/perf/builtin-kmem.c | 24 +-
tools/perf/builtin-kvm.c | 46 +-
tools/perf/builtin-lock.c | 30 +-
tools/perf/builtin-mem.c | 2 +-
tools/perf/builtin-record.c | 50 +-
tools/perf/builtin-report.c | 32 +-
tools/perf/builtin-sched.c | 96 +-
tools/perf/builtin-script.c | 167 +--
tools/perf/builtin-stat.c | 135 +--
tools/perf/builtin-timechart.c | 46 +-
tools/perf/builtin-top.c | 71 +-
tools/perf/builtin-trace.c | 619 +++++++---
tools/perf/examples/bpf/augmented_raw_syscalls.c | 284 +++--
tools/perf/include/bpf/bpf.h | 2 +
tools/perf/lib/Build | 12 +
tools/perf/lib/Documentation/Makefile | 7 +
tools/perf/lib/Documentation/man/libperf.rst | 100 ++
tools/perf/lib/Documentation/tutorial/tutorial.rst | 123 ++
tools/perf/lib/Makefile | 158 +++
tools/perf/lib/core.c | 34 +
tools/perf/lib/cpumap.c | 239 ++++
tools/perf/lib/evlist.c | 159 +++
tools/perf/lib/evsel.c | 232 ++++
tools/perf/lib/include/internal/cpumap.h | 17 +
tools/perf/lib/include/internal/evlist.h | 50 +
tools/perf/lib/include/internal/evsel.h | 29 +
tools/perf/lib/include/internal/lib.h | 10 +
tools/perf/lib/include/internal/tests.h | 19 +
tools/perf/lib/include/internal/threadmap.h | 23 +
.../perf/{util => lib/include/internal}/xyarray.h | 6 +-
tools/perf/lib/include/perf/core.h | 22 +
tools/perf/lib/include/perf/cpumap.h | 23 +
tools/perf/lib/include/perf/evlist.h | 35 +
tools/perf/lib/include/perf/evsel.h | 39 +
tools/perf/lib/include/perf/threadmap.h | 18 +
tools/perf/lib/internal.h | 18 +
tools/perf/lib/lib.c | 46 +
tools/perf/lib/libperf.map | 40 +
tools/perf/lib/libperf.pc.template | 11 +
tools/perf/lib/tests/Makefile | 38 +
tools/perf/lib/tests/test-cpumap.c | 21 +
tools/perf/lib/tests/test-evlist.c | 186 +++
tools/perf/lib/tests/test-evsel.c | 125 ++
tools/perf/lib/tests/test-threadmap.c | 21 +
tools/perf/lib/threadmap.c | 81 ++
tools/perf/lib/xyarray.c | 33 +
.../pmu-events/arch/powerpc/power9/memory.json | 2 +-
.../perf/pmu-events/arch/powerpc/power9/other.json | 8 +-
tools/perf/tests/backward-ring-buffer.c | 18 +-
tools/perf/tests/bitmap.c | 5 +-
tools/perf/tests/bpf.c | 12 +-
tools/perf/tests/code-reading.c | 50 +-
tools/perf/tests/cpumap.c | 21 +-
tools/perf/tests/event-times.c | 81 +-
tools/perf/tests/event_update.c | 13 +-
tools/perf/tests/evsel-roundtrip-name.c | 12 +-
tools/perf/tests/evsel-tp-sched.c | 8 +-
tools/perf/tests/hists_cumulate.c | 18 +-
tools/perf/tests/hists_filter.c | 10 +-
tools/perf/tests/hists_link.c | 10 +-
tools/perf/tests/hists_output.c | 20 +-
tools/perf/tests/keep-tracking.c | 44 +-
tools/perf/tests/mem2node.c | 5 +-
tools/perf/tests/mmap-basic.c | 28 +-
tools/perf/tests/mmap-thread-lookup.c | 4 +-
tools/perf/tests/openat-syscall-all-cpus.c | 18 +-
tools/perf/tests/openat-syscall-tp-fields.c | 14 +-
tools/perf/tests/openat-syscall.c | 10 +-
tools/perf/tests/parse-events.c | 1220 ++++++++++----------
tools/perf/tests/parse-no-sample-id-all.c | 6 +-
tools/perf/tests/perf-record.c | 10 +-
tools/perf/tests/sample-parsing.c | 14 +-
tools/perf/tests/sw-clock.c | 33 +-
tools/perf/tests/switch-tracking.c | 64 +-
tools/perf/tests/task-exit.c | 35 +-
tools/perf/tests/thread-map.c | 28 +-
tools/perf/tests/time-utils-test.c | 2 +-
tools/perf/tests/topology.c | 9 +-
tools/perf/ui/browsers/annotate.c | 16 +-
tools/perf/ui/browsers/hists.c | 54 +-
tools/perf/ui/browsers/res_sample.c | 4 +-
tools/perf/ui/browsers/scripts.c | 6 +-
tools/perf/ui/gtk/annotate.c | 8 +-
tools/perf/ui/gtk/gtk.h | 8 +-
tools/perf/ui/gtk/hists.c | 6 +-
tools/perf/ui/hist.c | 16 +-
tools/perf/util/Build | 6 -
tools/perf/util/annotate.c | 42 +-
tools/perf/util/annotate.h | 28 +-
tools/perf/util/auxtrace.c | 28 +-
tools/perf/util/auxtrace.h | 24 +-
tools/perf/util/bpf-event.c | 2 +-
tools/perf/util/bpf-event.h | 4 +-
tools/perf/util/bpf-loader.c | 38 +-
tools/perf/util/bpf-loader.h | 30 +-
tools/perf/util/build-id.c | 2 +-
tools/perf/util/build-id.h | 2 +-
tools/perf/util/callchain.c | 2 +-
tools/perf/util/callchain.h | 2 +-
tools/perf/util/cgroup.c | 22 +-
tools/perf/util/cgroup.h | 6 +-
tools/perf/util/counts.c | 17 +-
tools/perf/util/counts.h | 34 +-
tools/perf/util/cpumap.c | 264 +----
tools/perf/util/cpumap.h | 54 +-
tools/perf/util/cputopo.c | 13 +-
tools/perf/util/cs-etm.c | 28 +-
tools/perf/util/data-convert-bt.c | 38 +-
tools/perf/util/db-export.c | 10 +-
tools/perf/util/db-export.h | 10 +-
tools/perf/util/env.c | 2 +-
tools/perf/util/env.h | 2 +-
tools/perf/util/event.c | 30 +-
tools/perf/util/event.h | 14 +-
tools/perf/util/evlist.c | 607 +++++-----
tools/perf/util/evlist.h | 215 ++--
tools/perf/util/evsel.c | 497 ++++----
tools/perf/util/evsel.h | 197 ++--
tools/perf/util/evsel_fprintf.c | 16 +-
tools/perf/util/header.c | 225 ++--
tools/perf/util/header.h | 24 +-
tools/perf/util/hist.c | 32 +-
tools/perf/util/hist.h | 38 +-
tools/perf/util/intel-bts.c | 22 +-
tools/perf/util/intel-pt.c | 94 +-
tools/perf/util/jitdump.c | 8 +-
tools/perf/util/kvm-stat.h | 22 +-
tools/perf/util/machine.c | 12 +-
tools/perf/util/machine.h | 8 +-
tools/perf/util/map.h | 2 +-
tools/perf/util/metricgroup.c | 26 +-
tools/perf/util/metricgroup.h | 6 +-
tools/perf/util/mmap.c | 4 +-
tools/perf/util/parse-events.c | 155 +--
tools/perf/util/parse-events.h | 8 +-
tools/perf/util/pmu.c | 15 +-
tools/perf/util/pmu.h | 2 +-
tools/perf/util/python-ext-sources | 2 -
tools/perf/util/python.c | 73 +-
tools/perf/util/record.c | 73 +-
tools/perf/util/s390-cpumsf.c | 4 +-
tools/perf/util/s390-sample-raw.c | 6 +-
tools/perf/util/sample-raw.c | 2 +-
tools/perf/util/sample-raw.h | 6 +-
.../perf/util/scripting-engines/trace-event-perl.c | 14 +-
.../util/scripting-engines/trace-event-python.c | 40 +-
tools/perf/util/session.c | 81 +-
tools/perf/util/session.h | 12 +-
tools/perf/util/setup.py | 3 +-
tools/perf/util/sort.c | 60 +-
tools/perf/util/sort.h | 6 +-
tools/perf/util/stat-display.c | 112 +-
tools/perf/util/stat-shadow.c | 70 +-
tools/perf/util/stat.c | 64 +-
tools/perf/util/stat.h | 35 +-
tools/perf/util/svghelper.c | 7 +-
tools/perf/util/syscalltbl.c | 1 +
tools/perf/util/syscalltbl.h | 1 +
tools/perf/util/thread_map.c | 131 +--
tools/perf/util/thread_map.h | 58 +-
tools/perf/util/tool.h | 8 +-
tools/perf/util/top.c | 12 +-
tools/perf/util/top.h | 8 +-
tools/perf/util/trace-event-info.c | 14 +-
tools/perf/util/trace-event-scripting.c | 2 +-
tools/perf/util/trace-event.h | 4 +-
tools/perf/util/util.c | 40 -
tools/perf/util/util.h | 4 +-
196 files changed, 5958 insertions(+), 4051 deletions(-)
create mode 100644 tools/perf/lib/Build
create mode 100644 tools/perf/lib/Documentation/Makefile
create mode 100644 tools/perf/lib/Documentation/man/libperf.rst
create mode 100644 tools/perf/lib/Documentation/tutorial/tutorial.rst
create mode 100644 tools/perf/lib/Makefile
create mode 100644 tools/perf/lib/core.c
create mode 100644 tools/perf/lib/cpumap.c
create mode 100644 tools/perf/lib/evlist.c
create mode 100644 tools/perf/lib/evsel.c
create mode 100644 tools/perf/lib/include/internal/cpumap.h
create mode 100644 tools/perf/lib/include/internal/evlist.h
create mode 100644 tools/perf/lib/include/internal/evsel.h
create mode 100644 tools/perf/lib/include/internal/lib.h
create mode 100644 tools/perf/lib/include/internal/tests.h
create mode 100644 tools/perf/lib/include/internal/threadmap.h
rename tools/perf/{util => lib/include/internal}/xyarray.h (84%)
create mode 100644 tools/perf/lib/include/perf/core.h
create mode 100644 tools/perf/lib/include/perf/cpumap.h
create mode 100644 tools/perf/lib/include/perf/evlist.h
create mode 100644 tools/perf/lib/include/perf/evsel.h
create mode 100644 tools/perf/lib/include/perf/threadmap.h
create mode 100644 tools/perf/lib/internal.h
create mode 100644 tools/perf/lib/lib.c
create mode 100644 tools/perf/lib/libperf.map
create mode 100644 tools/perf/lib/libperf.pc.template
create mode 100644 tools/perf/lib/tests/Makefile
create mode 100644 tools/perf/lib/tests/test-cpumap.c
create mode 100644 tools/perf/lib/tests/test-evlist.c
create mode 100644 tools/perf/lib/tests/test-evsel.c
create mode 100644 tools/perf/lib/tests/test-threadmap.c
create mode 100644 tools/perf/lib/threadmap.c
create mode 100644 tools/perf/lib/xyarray.cTest results:
The first ones are container based builds of tools/perf with and without libelf support. Where clang is available, it is also used to build perf with/without libelf, and building with LIBCLANGLLVM=1 (built-in clang) with gcc and clang when clang and its devel libraries are installed.
The objtool and samples/bpf/ builds are disabled now that I'm switching from using the sources in a local volume to fetching them from a http server to build it inside the container, to make it easier to build in a container cluster. Those will come back later.
Several are cross builds, the ones with -x-ARCH and the android one, and those may not have all the features built, due to lack of multi-arch devel packages, available and being used so far on just a few, like debian:experimental-x-{arm64,mipsel}.
The 'perf test' one will perform a variety of tests exercising tools/perf/util/, tools/lib/{bpf,traceevent,etc}, as well as run perf commands with a variety of command line event specifications to then intercept the sys_perf_event syscall to check that the perf_event_attr fields are set up as expected, among a variety of other unit tests.
Then there is the 'make -C tools/perf build-test' ones, that build tools/perf/ with a variety of feature sets, exercising the build with an incomplete set of features as well as with a complete one. It is planned to have it run on each of the containers mentioned above, using some container orchestration infrastructure. Get in contact if interested in helping having this in place.
This is with the following patches that are in the BPF tree:
89bf23d6a1da libbpf: Avoid designated initializers for unnamed union members df538f1f4574 libbpf: Fix endianness macro usage for some compilers
$ export PERF_TARBALL=http://192.168.124.1/perf/perf-5.3.0-rc2.tar.xz $ dm 1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0, clang version 3.8.0 (tags/RELEASE_380/final) 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822, clang version 3.8.1 (tags/RELEASE_381/final) 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0, clang version 4.0.0 (tags/RELEASE_400/final) 4 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) 5 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) 6 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) 7 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) 8 alpine:edge : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) 9 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2), clang version 3.6.2 (tags/RELEASE_362/final) 10 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5), clang version 7.0.1 (Amazon Linux 2 7.0.1-1.amzn2.0.2) 11 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 12 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 13 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 14 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) 15 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 16 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 9.1.1 20190718 gcc-9-branch@273561, clang version 8.0.0 (tags/RELEASE_800/final) 17 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u2) 4.9.2, Debian clang version 3.5.0-10 (tags/RELEASE_350/final) (based on LLVM 3.5.0) 18 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, clang version 3.8.1-24 (tags/RELEASE_381/final) 19 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 20 debian:experimental : Ok gcc (Debian 8.3.0-19) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 21 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 22 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 23 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.3.0-7) 8.3.0 24 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 25 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 26 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.5.0 (tags/RELEASE_350/final) 27 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final) 28 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final) 29 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 30 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final) 31 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final) 32 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final) 33 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final) 34 fedora:29 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 7.0.1 (Fedora 7.0.1-6.fc29) 35 fedora:30 : Ok gcc (GCC) 9.1.1 20190503 (Red Hat 9.1.1-1), clang version 8.0.0 (Fedora 8.0.0-1.fc30) 36 fedora:30-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 37 fedora:30-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 38 fedora:31 : Ok gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2), clang version 8.0.0 (Fedora 8.0.0-3.fc31) 39 fedora:rawhide : Ok gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2), clang version 8.0.0 (Fedora 8.0.0-3.fc31) 40 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 8.3.0-r1 p1.1) 8.3.0 41 mageia:5 : Ok gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/final) 42 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final) 43 mageia:7 : Ok gcc (Mageia 8.3.1-0.20190524.1.mga7) 8.3.1 20190524, clang version 8.0.0 (Mageia 8.0.0-1.mga7) 44 manjaro:latest : Ok gcc (GCC) 9.1.0, clang version 8.0.1 (tags/RELEASE_801/final) 45 opensuse:15.0 : Ok gcc (SUSE Linux) 7.4.1 20190424 [gcc-7-branch revision 270538], clang version 5.0.1 (tags/RELEASE_501/final 312548) 46 opensuse:15.1 : Ok gcc (SUSE Linux) 7.4.0, clang version 7.0.1 (tags/RELEASE_701/final 349238) 47 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5, clang version 3.8.0 (tags/RELEASE_380/final 262553) 48 opensuse:tumbleweed : Ok gcc (SUSE Linux) 9.1.1 20190703 [gcc-9-branch revision 273008], clang version 8.0.0 (tags/RELEASE_800/final 356365) 49 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1) 50 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36.0.1), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 51 oraclelinux:8 : Ok gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3.0.1), clang version 7.0.1 (tags/RELEASE_701/final) 52 ubuntu:12.04 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 53 ubuntu:14.04 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4, Ubuntu clang version 3.4-1ubuntu3 (tags/RELEASE_34/final) (based on LLVM 3.4) 54 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609, clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final) 55 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 56 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 57 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 58 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 59 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 60 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 61 ubuntu:18.04 : Ok gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0, clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final) 62 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 63 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 64 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 65 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 66 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 67 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 68 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 69 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 70 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 71 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 72 ubuntu:18.10 : Ok gcc (Ubuntu 8.3.0-6ubuntu1~18.10.1) 8.3.0, clang version 7.0.0-3 (tags/RELEASE_700/final) 73 ubuntu:19.04 : Ok gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final) 74 ubuntu:19.04-x-alpha : Ok alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 75 ubuntu:19.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0
# uname -a
Linux quaco 5.2.0-rc7+ #4 SMP Sat Jul 6 14:43:41 -03 2019 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
123a039d0d54 perf vendor events power9: Added missing event descriptions
# perf version --build-options
perf version 5.3.rc2.g123a039d0d54
dwarf: [ on ] # HAVE_DWARF_SUPPORT
dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT
glibc: [ on ] # HAVE_GLIBC_SUPPORT
gtk2: [ on ] # HAVE_GTK2_SUPPORT
syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT
libbfd: [ on ] # HAVE_LIBBFD_SUPPORT
libelf: [ on ] # HAVE_LIBELF_SUPPORT
libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT
numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT
libperl: [ on ] # HAVE_LIBPERL_SUPPORT
libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT
libslang: [ on ] # HAVE_SLANG_SUPPORT
libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT
libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT
libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT
zlib: [ on ] # HAVE_ZLIB_SUPPORT
lzma: [ on ] # HAVE_LZMA_SUPPORT
get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORT
aio: [ on ] # HAVE_AIO_SUPPORT
zstd: [ on ] # HAVE_ZSTD_SUPPORT
# perf test
1: vmlinux symtab matches kallsyms : Ok
2: Detect openat syscall event : Ok
3: Detect openat syscall event on all cpus : Ok
4: Read samples using the mmap interface : Ok
5: Test data source output : Ok
6: Parse event definition strings : Ok
7: Simple expression parser : Ok
8: PERF_RECORD_* events & perf_sample fields : Ok
9: Parse perf pmu format : Ok
10: DSO data read : Ok
11: DSO data cache : Ok
12: DSO data reopen : Ok
13: Roundtrip evsel->name : Ok
14: Parse sched tracepoints fields : Ok
15: syscalls:sys_enter_openat event fields : Ok
16: Setup struct perf_event_attr : Ok
17: Match and link multiple hists : Ok
18: 'import perf' in python : Ok
19: Breakpoint overflow signal handler : Ok
20: Breakpoint overflow sampling : Ok
21: Breakpoint accounting : Ok
22: Watchpoint :
22.1: Read Only Watchpoint : Skip
22.2: Write Only Watchpoint : Ok
22.3: Read / Write Watchpoint : Ok
22.4: Modify Watchpoint : Ok
23: Number of exit events of a simple workload : Ok
24: Software clock events period values : Ok
25: Object code reading : Ok
26: Sample parsing : Ok
27: Use a dummy software event to keep tracking : Ok
28: Parse with no sample_id_all bit set : Ok
29: Filter hist entries : Ok
30: Lookup mmap thread : Ok
31: Share thread mg : Ok
32: Sort output of hist entries : Ok
33: Cumulate child hist entries : Ok
34: Track with sched_switch : Ok
35: Filter fds with revents mask in a fdarray : Ok
36: Add fd to a fdarray, making it autogrow : Ok
37: kmod_path__parse : Ok
38: Thread map : Ok
39: LLVM search and compile :
39.1: Basic BPF llvm compile : Ok
39.2: kbuild searching : Ok
39.3: Compile source for BPF prologue generation : Ok
39.4: Compile source for BPF relocation : Ok
40: Session topology : Ok
41: BPF filter :
41.1: Basic BPF filtering : Ok
41.2: BPF pinning : Ok
41.3: BPF prologue generation : Ok
41.4: BPF relocation checker : Ok
42: Synthesize thread map : Ok
43: Remove thread map : Ok
44: Synthesize cpu map : Ok
45: Synthesize stat config : Ok
46: Synthesize stat : Ok
47: Synthesize stat round : Ok
48: Synthesize attr update : Ok
49: Event times : Ok
50: Read backward ring buffer : Ok
51: Print cpu map : Ok
52: Probe SDT events : Ok
53: is_printable_array : Ok
54: Print bitmap : Ok
55: perf hooks : Ok
56: builtin clang support : Skip (not compiled in)
57: unit_number__scnprintf : Ok
58: mem2node : Ok
59: time utils : Ok
60: map_groups__merge_in : Ok
61: x86 rdpmc : Ok
62: Convert perf time to TSC : Ok
63: DWARF unwind : Ok
64: x86 instruction decoder - new instructions : Ok
65: Intel PT packet decoder : Ok
66: x86 bp modify : Ok
67: probe libc's inet_pton & backtrace it with ping : Ok
68: Use vfs_getname probe to get syscall args filenames : Ok
69: Add vfs_getname probe to get syscall args filenames : Ok
70: Check open filename arg using perf trace + vfs_getname: Ok
71: Zstd perf.data compression/decompression : Ok $ make -C tools/perf build-test
make: Entering directory '/home/acme/git/perf/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_no_libelf_O: make NO_LIBELF=1
make_install_O: make install
make_perf_o_O: make perf.o
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_util_map_o_O: make util/map.o
make_tags_O: make tags
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_no_auxtrace_O: make NO_AUXTRACE=1
make_no_libbpf_O: make NO_LIBBPF=1
make_no_libperl_O: make NO_LIBPERL=1
make_help_O: make help
make_no_slang_O: make NO_SLANG=1
make_install_prefix_O: make install prefix=/tmp/krava
make_with_babeltrace_O: make LIBBABELTRACE=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_no_demangle_O: make NO_DEMANGLE=1
make_install_bin_O: make install-bin
make_static_O: make LDFLAGS=-static
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_gtk2_O: make NO_GTK2=1
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_debug_O: make DEBUG=1
make_cscope_O: make cscope
make_no_libnuma_O: make NO_LIBNUMA=1
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_no_libpython_O: make NO_LIBPYTHON=1
make_clean_all_O: make clean all
make_no_libbionic_O: make NO_LIBBIONIC=1
make_minimal_O: make NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
make_doc_O: make doc
make_no_newt_O: make NO_NEWT=1
make_pure_O: make
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/107 perf include bpf: Add bpf_tail_call() prototype
From: Arnaldo Carvalho de Melo <[email protected]>
Will be used together with BPF_MAP_TYPE_PROG_ARRAY in tools/perf/examples/bpf/augmented_raw_syscalls.c.
--- tools/perf/include/bpf/bpf.h | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/include/bpf/bpf.h +2 -0
@@ -45,6 +45,8 @@ struct ____btf_map_##name __attribute__((section(".maps." #name), used)) \static int (*bpf_map_update_elem)(struct bpf_map *map,void *key,void *value,u64 flags) = (void *)BPF_FUNC_map_update_elem;static void *(*bpf_map_lookup_elem)(struct bpf_map *map,void *key) = (void *)BPF_FUNC_map_lookup_elem; +static void (*bpf_tail_call)(void *ctx,void *map,int index) = (void *)BPF_FUNC_tail_call; +#define SEC (NAME ) __attribute__((section(NAME), used))#define probe (function, vars) \
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/107 perf bpf: Do not attach a BPF prog to a tracepoint if its name starts with !
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
With BPF_MAP_TYPE_PROG_ARRAY + bpf_tail_call() we want to have BPF programs, i.e. functions in a object file that perf's BPF loader shouldn't try to attach to anything, i.e. "!syscalls:sys_enter_open" should just stay there, not be attached to a tracepoint with that name, it'll be used by, for instance, 'perf trace' to associate with syscalls that copy, in addition to the syscall raw args, a filename pointed by the first arg, i.e. multiple syscalls that need copying the same pointer arg in the same way, as a filename, for instance, will share the same BPF program/function.
Right now when perf's BPF loader sees a function with a name "sys:name" it'll look for a tracepoint and will associate that BPF program with it, say:
SEC("raw_syscalls:sys_enter")
int sys_enter(struct syscall_enter_args *args)
{
//SNIP
}Will crate a perf_evsel tracepoint event and then associate with it that BPF program.
This convention at some point will switch to the one used by the BPF loader in libbpf, but to experiment with BPF_MAP_TYPE_PROG_ARRAY in 'perf trace' lets do this, that will not require changing too much stuff.
--- tools/perf/util/parse-events.c | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/perf/util/parse-events.c +9 -0
@@ -639,6 +639,15 @@ static int add_bpf_event(const char *group, const char *event, int fd,struct list_head *list = param->list;struct perf_evsel *pos;int err; +/* +* Check if we should add the event, i.e. if it is a TP but starts with a '!', +* then don't add the tracepoint, this will be used for something else, like +* adding to a BPF_MAP_TYPE_PROG_ARRAY. +* +* See tools/perf/examples/bpf/augmented_raw_syscalls.c +*/ +if (group[0 ] =='!' ) +return 0 ;pr_debug ("add bpf event %s:%s and attach bpf program %d\n" , group, event, fd);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/107 perf evsel: Store backpointer to attached bpf_object
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We may want to get to this bpf_object, to search for other BPF programs, etc.
--- tools/perf/util/bpf-loader.c | 4 ++-- tools/perf/util/bpf-loader.h | 2 +- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 3 +++ tools/perf/util/parse-events.c | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-)
tools/perf/util/bpf-loader.c +2 -2
@@ -763,7 +763,7 @@ int bpf__foreach_event(struct bpf_object *obj,if (priv->is_tp) { fd =bpf_program__fd (prog); - err = (*func)(priv->sys_name, priv->evt_name, fd, arg); + err = (*func)(priv->sys_name, priv->evt_name, fd, obj, arg);if (err) {pr_debug ("bpf: tracepoint call back failed, stop iterate\n" );return err;
@@ -788,7 +788,7 @@ int bpf__foreach_event(struct bpf_object *obj,return fd; } - err = (*func)(tev->group, tev->event, fd, arg); + err = (*func)(tev->group, tev->event, fd, obj, arg);if (err) {pr_debug ("bpf: call back failed, stop iterate\n" );return err;
tools/perf/util/bpf-loader.h +1 -1
@@ -46,7 +46,7 @@ struct parse_events_term;#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"typedef int (*bpf_prog_iter_callback_t )(const char *group,const char *event, -int fd,void *arg); +int fd,struct bpf_object *obj,void *arg);#ifdef HAVE_LIBBPF_SUPPORT struct bpf_object *bpf__prepare_load (const char *filename,bool source);
tools/perf/util/evsel.c +1 -0
@@ -234,6 +234,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->scale =1.0 ; evsel->max_events =ULONG_MAX ; evsel->evlist =NULL ; + evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ;INIT_LIST_HEAD (&evsel->node);INIT_LIST_HEAD (&evsel->config_terms);
tools/perf/util/evsel.h +3 -0
@@ -82,6 +82,8 @@ enum perf_tool_event { PERF_TOOL_DURATION_TIME = 1, }; +struct bpf_object ; +/** struct perf_evsel - event selector * * @evlist - evlist this evsel is in, if it is in one.
@@ -152,6 +154,7 @@ struct perf_evsel {char *group_name;bool cmdline_group_boundary;struct list_head config_terms; +struct bpf_object *bpf_obj;int bpf_fd;bool auto_merge_stats;bool merged_stat;
tools/perf/util/parse-events.c +2 -1
@@ -630,7 +630,7 @@ struct __add_bpf_event_param {struct list_head *head_config; }; -static int add_bpf_event (const char *group,const char *event,int fd, +static int add_bpf_event (const char *group,const char *event,int fd,struct bpf_object *obj,void *_param) {LIST_HEAD (new_evsels);
@@ -672,6 +672,7 @@ static int add_bpf_event(const char *group, const char *event, int fd,pr_debug ("adding %s:%s to %p\n" , group, event, pos); pos->bpf_fd = fd; + pos->bpf_obj = obj; }list_splice (&new_evsels, list);return 0 ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/107 perf trace: Add pointer to BPF object containing __augmented_syscalls__
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
So that we can use it when looking for other components of that object file, such as other programs to add to the BPF_MAP_TYPE_PROG_ARRAY and use with bpf_tail_call().
--- tools/perf/builtin-trace.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tools/perf/builtin-trace.c +15 -0
@@ -96,6 +96,7 @@ struct trace {struct perf_evlist *evlist;struct machine *host;struct thread *current; +struct bpf_object *bpf_obj;struct cgroup *cgroup;u64 base_time;FILE *output;
@@ -3895,6 +3896,20 @@ int cmd_trace(int argc, const char **argv)if (evsel) { trace.syscalls.events.augmented = evsel; + + evsel =perf_evlist__find_tracepoint_by_name (trace.evlist,"raw_syscalls:sys_enter" ); +if (evsel ==NULL ) { +pr_err ("ERROR: raw_syscalls:sys_enter not found in the augmented BPF object\n" ); + goto out; + } + +if (evsel->bpf_obj ==NULL ) { +pr_err ("ERROR: raw_syscalls:sys_enter not associated to a BPF object\n" ); + goto out; + } + + trace.bpf_obj = evsel->bpf_obj; +trace__set_bpf_map_filtered_pids (&trace);trace__set_bpf_map_syscalls (&trace); }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/107 perf trace: Look up maps just on the __augmented_syscalls__ BPF object
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We can conceivably have multiple BPF object files for other purposes, so better look just on the BPF object containing the __augmented_syscalls__ map for all things augmented_syscalls related.
--- tools/perf/builtin-trace.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
tools/perf/builtin-trace.c +7 -13
@@ -3669,28 +3669,22 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int ureturn 0 ; } -static struct bpf_map *bpf__find_map_by_name (const char *name) +static struct bpf_map *trace__find_bpf_map_by_name (struct trace *trace,const char *name) { -struct bpf_object *obj, *tmp; - -bpf_object__for_each_safe (obj, tmp) { -struct bpf_map *map =bpf_object__find_map_by_name (obj, name); -if (map) -return map; - - } +if (trace->bpf_obj ==NULL ) +return NULL ; -return NULL ; +return bpf_object__find_map_by_name (trace->bpf_obj, name); }static void trace__set_bpf_map_filtered_pids (struct trace *trace) { - trace->filter_pids.map =bpf__find_map_by_name ("pids_filtered" ); + trace->filter_pids.map =trace__find_bpf_map_by_name (trace,"pids_filtered" ); }static void trace__set_bpf_map_syscalls (struct trace *trace) { - trace->syscalls.map =bpf__find_map_by_name ("syscalls" ); + trace->syscalls.map =trace__find_bpf_map_by_name (trace,"syscalls" ); }static int trace__config (const char *var,const char *value,void *arg)
@@ -3924,7 +3918,7 @@ int cmd_trace(int argc, const char **argv) err =-1 ;if (map_dump_str) { - trace.dump.map =bpf__find_map_by_name (map_dump_str); + trace.dump.map =trace__find_bpf_map_by_name (&trace, map_dump_str);if (trace.dump.map ==NULL ) {pr_err ("ERROR: BPF map \"%s\" not found\n" , map_dump_str); goto out;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/107 perf trace: Order -e syscalls table
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The ev_qualifier is an array with the syscall ids passed via -e on the command line, sort it as we'll search it when setting up the BPF_MAP_TYPE_PROG_ARRAY.
--- tools/perf/builtin-trace.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/builtin-trace.c +8 -0
@@ -1528,6 +1528,13 @@ static int trace__read_syscall_info(struct trace *trace, int id)return syscall__set_arg_fmts (sc); } +static int intcmp (const void *a,const void *b) +{ +const int *one = a, *another = b; + +return *one - *another; +} +static int trace__validate_ev_qualifier (struct trace *trace) {int err =0 ;
@@ -1591,6 +1598,7 @@ static int trace__validate_ev_qualifier(struct trace *trace) } trace->ev_qualifier_ids.nr = nr_used; +qsort (trace->ev_qualifier_ids.entries, nr_used,sizeof (int ), intcmp); out:if (printed_invalid_prefix)pr_debug ("\n" );
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/107 perf trace: Add BPF handler for unaugmented syscalls
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Will be used to assign to syscalls that don't need augmentation, i.e. those with just integer args.
All syscalls will be in a BPF_MAP_TYPE_PROG_ARRAY, and the bpf_tail_call() keyed by the syscall id will either find nothing in place, which means the syscall is being filtered, or a function that will either add things like filenames to the ring buffer, right after the raw syscall args, or be this unaugmented handler that will just return 1, meaning don't filter the original raw_syscalls:sys_{enter,exit} tracepoint.
For now it is not really being used, this is just leg work to break the patch into smaller pieces.
It introduces a trace__find_bpf_program_by_title() helper that in turn uses libbpf's bpf_object__find_program_by_title() on the BPF object with the __augmented_syscalls__ map. "title" is how libbpf calls the SEC() argument for functions, i.e. the ELF section that follows a convention to specify what BPF program (a function with this SEC() marking) should be connected to which tracepoint, kprobes, etc.
In perf anything that is of the form SEC("sys:event_name") will be connected to that tracepoint by perf's BPF loader.
In this case its something that will be bpf_tail_call()ed from either the "raw_syscalls:sys_enter" or "raw_syscall:sys_exit" tracepoints, so its named "!raw_syscalls:unaugmented" to convey that idea, i.e. its not going to be directly attached to a tracepoint, thus it starts with a "!".
--- tools/perf/builtin-trace.c | 16 ++++++++++++++++ tools/perf/examples/bpf/augmented_raw_syscalls.c | 6 ++++++ 2 files changed, 22 insertions(+)
tools/perf/builtin-trace.c +16 -0
@@ -88,6 +88,7 @@ struct trace { *sys_exit, *augmented; } events; +struct bpf_program *unaugmented_prog; } syscalls;struct {struct bpf_map *map;
@@ -2733,6 +2734,14 @@ static int trace__set_ev_qualifier_tp_filter(struct trace *trace) }#ifdef HAVE_LIBBPF_SUPPORT +static struct bpf_program *trace__find_bpf_program_by_title (struct trace *trace,const char *name) +{ +if (trace->bpf_obj ==NULL ) +return NULL ; + +return bpf_object__find_program_by_title (trace->bpf_obj, name); +} +static void trace__init_bpf_map_syscall_args (struct trace *trace,int id,struct bpf_map_syscall_entry *entry) {struct syscall *sc =trace__syscall_info (trace,NULL , id);
@@ -2814,6 +2823,12 @@ static int trace__init_syscalls_bpf_map(struct trace *trace __maybe_unused) {return 0 ; } + +static struct bpf_program *trace__find_bpf_program_by_title (struct trace *trace__maybe_unused , +const char *name__maybe_unused ) +{ +return NULL ; +}#endif // HAVE_LIBBPF_SUPPORT static int trace__set_ev_qualifier_filter (struct trace *trace)
@@ -3914,6 +3929,7 @@ int cmd_trace(int argc, const char **argv)trace__set_bpf_map_filtered_pids (&trace);trace__set_bpf_map_syscalls (&trace); + trace.syscalls.unaugmented_prog =trace__find_bpf_program_by_title (&trace,"!raw_syscalls:unaugmented" ); } err =bpf__setup_stdout (trace.evlist);
tools/perf/examples/bpf/augmented_raw_syscalls.c +6 -0
@@ -88,6 +88,12 @@ unsigned int augmented_filename__read(struct augmented_filename *augmented_filenreturn len; } +SEC("!raw_syscalls:unaugmented") +int syscall_unaugmented (struct syscall_enter_args *args) +{ +return 1 ; +} + SEC("raw_syscalls:sys_enter")int sys_enter (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 8/107 perf trace: Allow specifying the bpf prog to augment specific syscalls
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
This is a step in the direction of being able to use a BPF_MAP_TYPE_PROG_ARRAY to handle syscalls that need to copy pointer payloads in addition to the raw tracepoint syscall args.
There is a first example in tools/perf/examples/bpf/augmented_raw_syscalls.c for the 'open' syscall.
Next step is to introduce the prog array map and use this 'open' augmenter, then use that augmenter in other syscalls that also only copy the first arg as a string, and then show how to use with a syscall that reads more than one filename, like 'rename', etc.
--- tools/perf/builtin-trace.c | 50 ++++++++++++++++++- .../examples/bpf/augmented_raw_syscalls.c | 23 +++++++++ 2 files changed, 71 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +48 -2
@@ -690,6 +690,10 @@ struct syscall_arg_fmt { static struct syscall_fmt { const char *name; const char *alias; + struct { + const char *sys_enter, + *sys_exit; + } bpf_prog_name; struct syscall_arg_fmt arg[6]; u8 nr_args; bool errpid;
@@ -823,6 +827,7 @@ static struct syscall_fmt { { .name = "newfstatat", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, }, { .name = "open", + .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_open", }, .arg = { [1] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "open_by_handle_at", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ },
@@ -967,6 +972,10 @@ struct syscall {struct tep_event *tp_format;int nr_args;int args_size; +struct { +struct bpf_program *sys_enter, + *sys_exit; + } bpf_prog;bool is_exit;bool is_open;struct tep_format_field *args;
@@ -2742,6 +2751,39 @@ static struct bpf_program *trace__find_bpf_program_by_title(struct trace *trace,return bpf_object__find_program_by_title (trace->bpf_obj, name); } +static struct bpf_program *trace__find_syscall_bpf_prog (struct trace *trace,struct syscall *sc, +const char *prog_name,const char *type) +{ +struct bpf_program *prog; + +if (prog_name ==NULL ) + goto out_unaugmented; + + prog =trace__find_bpf_program_by_title (trace, prog_name); +if (prog !=NULL ) +return prog; + +pr_debug ("Couldn't find BPF prog \"%s\" to associate with syscalls:sys_%s_%s, not augmenting it\n" , + prog_name, type, sc->name); +out_unaugmented: +return trace->syscalls.unaugmented_prog; +} + +static void trace__init_syscall_bpf_progs (struct trace *trace,int id) +{ +struct syscall *sc =trace__syscall_info (trace,NULL , id); + +if (sc ==NULL ) +return ; + +if (sc->fmt !=NULL ) { + sc->bpf_prog.sys_enter =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_enter,"enter" ); + sc->bpf_prog.sys_exit =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_exit,"exit" ); + }else { + sc->bpf_prog.sys_enter = sc->bpf_prog.sys_exit = trace->syscalls.unaugmented_prog; + } +} +static void trace__init_bpf_map_syscall_args (struct trace *trace,int id,struct bpf_map_syscall_entry *entry) {struct syscall *sc =trace__syscall_info (trace,NULL , id);
@@ -2773,8 +2815,10 @@ static int trace__set_ev_qualifier_bpf_filter(struct trace *trace)for (i =0 ; i < trace->ev_qualifier_ids.nr; ++i) {int key = trace->ev_qualifier_ids.entries[i]; -if (value.enabled) +if (value.enabled) {trace__init_bpf_map_syscall_args (trace, key, &value); +trace__init_syscall_bpf_progs (trace, key); + } err =bpf_map_update_elem (fd, &key, &value,BPF_EXIST );if (err)
@@ -2793,8 +2837,10 @@ static int __trace__init_syscalls_bpf_map(struct trace *trace, bool enabled)int err =0 , key;for (key =0 ; key < trace->sctbl->syscalls.nr_entries; ++key) { -if (enabled) +if (enabled) {trace__init_bpf_map_syscall_args (trace, key, &value); +trace__init_syscall_bpf_progs (trace, key); + } err =bpf_map_update_elem (fd, &key, &value,BPF_ANY );if (err)
tools/perf/examples/bpf/augmented_raw_syscalls.c +23 -0
@@ -94,6 +94,29 @@ int syscall_unaugmented(struct syscall_enter_args *args)return 1 ; } +/* +* This will be tail_called from SEC("raw_syscalls:sys_enter"), so will find in +* augmented_filename_map what was read by that raw_syscalls:sys_enter and go +* on from there, reading the first syscall arg as a string, i.e. open's +* filename. +*/ +SEC("!syscalls:sys_enter_open") +int sys_enter_open (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +const void *filename_arg = (const void *)args->args[0 ]; +unsigned int len =sizeof (augmented_args->args); + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + + len +=augmented_filename__read (&augmented_args->filename, filename_arg,sizeof (augmented_args->filename.value)); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +} + SEC("raw_syscalls:sys_enter")int sys_enter (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 9/107 perf trace: Put the per-syscall entry/exit prog_array BPF map infrastructure in place
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
I.e. look for "syscalls_sys_enter" and "syscalls_sys_exit" BPF maps of type PROG_ARRAY and populate it with the handlers as specified per syscall, for now only 'open' is wiring it to something, in time all syscalls that need to copy arguments entering a syscall or returning from one will set these to the right handlers, reusing when possible pre-existing ones.
Next step is to use bpf_tail_call() into that.
--- tools/perf/builtin-trace.c | 76 ++++++++++++++++++- .../examples/bpf/augmented_raw_syscalls.c | 14 ++++ 2 files changed, 86 insertions(+), 4 deletions(-)
tools/perf/builtin-trace.c +72 -4
@@ -1,4 +1,3 @@ -// SPDX-License-Identifier: GPL-2.0-only /* * builtin-trace.c *
@@ -83,6 +82,10 @@ struct trace {int max;struct syscall *table;struct bpf_map *map; +struct {// per syscall BPF_MAP_TYPE_PROG_ARRAY +struct bpf_map *sys_enter, + *sys_exit; + } prog_array;struct {struct perf_evsel *sys_enter, *sys_exit,
@@ -1619,6 +1622,22 @@ static int trace__validate_ev_qualifier(struct trace *trace) goto out; } +static __maybe_unused bool trace__syscall_enabled (struct trace *trace,int id) +{ +bool in_ev_qualifier; + +if (trace->ev_qualifier_ids.nr ==0 ) +return true; + + in_ev_qualifier =bsearch (&id, trace->ev_qualifier_ids.entries, + trace->ev_qualifier_ids.nr,sizeof (int ), intcmp) !=NULL ; + +if (in_ev_qualifier) +return !trace->not_ev_qualifier; + +return trace->not_ev_qualifier; +} +/* * args is to be interpreted as a series of longs but we need to handle * 8-byte unaligned accesses. args points to raw_data within the event
@@ -2784,6 +2803,18 @@ static void trace__init_syscall_bpf_progs(struct trace *trace, int id) } } +static int trace__bpf_prog_sys_enter_fd (struct trace *trace,int id) +{ +struct syscall *sc =trace__syscall_info (trace,NULL , id); +return sc ?bpf_program__fd (sc->bpf_prog.sys_enter) :bpf_program__fd (trace->syscalls.unaugmented_prog); +} + +static int trace__bpf_prog_sys_exit_fd (struct trace *trace,int id) +{ +struct syscall *sc =trace__syscall_info (trace,NULL , id); +return sc ?bpf_program__fd (sc->bpf_prog.sys_exit) :bpf_program__fd (trace->syscalls.unaugmented_prog); +} +static void trace__init_bpf_map_syscall_args (struct trace *trace,int id,struct bpf_map_syscall_entry *entry) {struct syscall *sc =trace__syscall_info (trace,NULL , id);
@@ -2837,10 +2868,8 @@ static int __trace__init_syscalls_bpf_map(struct trace *trace, bool enabled)int err =0 , key;for (key =0 ; key < trace->sctbl->syscalls.nr_entries; ++key) { -if (enabled) { +if (enabled)trace__init_bpf_map_syscall_args (trace, key, &value); -trace__init_syscall_bpf_progs (trace, key); - } err =bpf_map_update_elem (fd, &key, &value,BPF_ANY );if (err)
@@ -2859,6 +2888,34 @@ static int trace__init_syscalls_bpf_map(struct trace *trace)return __trace__init_syscalls_bpf_map (trace, enabled); } + +static int trace__init_syscalls_bpf_prog_array_maps (struct trace *trace) +{ +int map_enter_fd =bpf_map__fd (trace->syscalls.prog_array.sys_enter), + map_exit_fd =bpf_map__fd (trace->syscalls.prog_array.sys_exit); +int err =0 , key; + +for (key =0 ; key < trace->sctbl->syscalls.nr_entries; ++key) { +int prog_fd; + +if (!trace__syscall_enabled (trace, key)) +continue ; + +trace__init_syscall_bpf_progs (trace, key); + +// It'll get at least the "!raw_syscalls:unaugmented" + prog_fd =trace__bpf_prog_sys_enter_fd (trace, key); + err =bpf_map_update_elem (map_enter_fd, &key, &prog_fd,BPF_ANY ); +if (err) +break ; + prog_fd =trace__bpf_prog_sys_exit_fd (trace, key); + err =bpf_map_update_elem (map_exit_fd, &key, &prog_fd,BPF_ANY ); +if (err) +break ; + } + +return err; +}#else static int trace__set_ev_qualifier_bpf_filter (struct trace *trace__maybe_unused ) {
@@ -2875,6 +2932,11 @@ static struct bpf_program *trace__find_bpf_program_by_title(struct trace *trace {return NULL ; } + +static int trace__init_syscalls_bpf_prog_array_maps (struct trace *trace__maybe_unused ) +{ +return 0 ; +}#endif // HAVE_LIBBPF_SUPPORT static int trace__set_ev_qualifier_filter (struct trace *trace)
@@ -3129,6 +3191,10 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (trace->syscalls.map)trace__init_syscalls_bpf_map (trace); +if (trace->syscalls.prog_array.sys_enter) +trace__init_syscalls_bpf_prog_array_maps (trace); + +if (trace->ev_qualifier_ids.nr >0 ) { err =trace__set_ev_qualifier_filter (trace);if (err <0 )
@@ -3754,6 +3820,8 @@ static void trace__set_bpf_map_filtered_pids(struct trace *trace)static void trace__set_bpf_map_syscalls (struct trace *trace) { trace->syscalls.map =trace__find_bpf_map_by_name (trace,"syscalls" ); + trace->syscalls.prog_array.sys_enter =trace__find_bpf_map_by_name (trace,"syscalls_sys_enter" ); + trace->syscalls.prog_array.sys_exit =trace__find_bpf_map_by_name (trace,"syscalls_sys_exit" ); }static int trace__config (const char *var,const char *value,void *arg)
tools/perf/examples/bpf/augmented_raw_syscalls.c +14 -0
@@ -33,6 +33,20 @@ struct syscall { bpf_map(syscalls, ARRAY, int, struct syscall, 512); +/* +* What to augment at entry? +* +* Pointer arg payloads (filenames, etc) passed from userspace to the kernel +*/ +bpf_map (syscalls_sys_enter,PROG_ARRAY , u32, u32,512 ); + +/* +* What to augment at exit? +* +* Pointer arg payloads returned from the kernel (struct stat, etc) to userspace. +*/ +bpf_map (syscalls_sys_exit,PROG_ARRAY , u32, u32,512 ); +struct syscall_enter_args {unsigned long long common_tp_fields;long syscall_nr;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 10/107 perf trace: Handle raw_syscalls:sys_enter just like the BPF_OUTPUT augmented event
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
So, we use a PERF_COUNT_SW_BPF_OUTPUT to output the augmented sys_enter payload, i.e. to output more than just the raw syscall args, and if something goes wrong when handling an unfiltered syscall, we bail out and just return 1 in the bpf program associated with raw_syscalls:sys_enter, meaning, don't filter that tracepoint, in which case what will appear in the perf ring buffer isn't the BPF_OUTPUT event, but the original raw_syscalls:sys_enter event with its normal payload.
Now that we're switching to using a bpf_tail_call + BPF_MAP_TYPE_PROG_ARRAY we're going to use this in the common case, so a bug where raw_syscalls:sys_enter wasn't being handled by trace__sys_enter() surfaced and for that case, instead of using the strace-like augmenter (trace__sys_enter()), we continued to use the normal generic tracepoint handler:
(gdb) p evsel
$2 = (struct perf_evsel *) 0xc03e40
(gdb) p evsel->name
$3 = 0xbc56c0 "raw_syscalls:sys_enter" (gdb) p ((struct perf_evsel *) 0xc03e40)->name $4 = 0xbc56c0 "raw_syscalls:sys_enter" (gdb) p ((struct perf_evsel *) 0xc03e40)->handler $5 = (void *) 0x495eb3 <trace__event_handler>
This resulted in this:
0.027 raw_syscalls:sys_enter:NR 12 (0, 7fcfcac64c9b, 4d, 7fcfcac64c9b, 7fcfcac6ce00, 19)
... [continued]: brk()) = 0x563b88677000I.e. only the sys_exit tracepoint was being properly handled, but since the sys_enter went to the generic trace__event_handler() we printed it using libtraceevent's formatter instead of 'perf trace's strace-like one.
Fix it by setting trace__sys_enter() as the handler for raw_syscalls:sys_enter and setup the tp_field tracepoint field accessors.
Now, to test it we just make raw_syscalls:sys_enter return 1 right after checking if the pid is filtered, making it not use bpf_perf_output_event() but rather ask for the tracepoint not to be filtered and the result is the expected one:
brk(NULL) = 0x556f42d6e000
I.e. raw_syscalls:sys_enter returns 1, gets handled by trace__sys_enter() and gets it combined with the raw_syscalls:sys_exit in a strace-like way.
--- tools/perf/builtin-trace.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tools/perf/builtin-trace.c +15 -0
@@ -4128,7 +4128,22 @@ int cmd_trace(int argc, const char **argv)if (perf_evsel__init_augmented_syscall_tp (augmented, evsel) ||perf_evsel__init_augmented_syscall_tp_args (augmented)) goto out; +/* +* Augmented is __augmented_syscalls__ BPF_OUTPUT event +* Above we made sure we can get from the payload the tp fields +* that we get from syscalls:sys_enter tracefs format file. +*/ augmented->handler = trace__sys_enter; +/* +* Now we do the same for the *syscalls:sys_enter event so that +* if we handle it directly, i.e. if the BPF prog returns 0 so +* as not to filter it, then we'll handle it just like we would +* for the BPF_OUTPUT one: +*/ +if (perf_evsel__init_augmented_syscall_tp (evsel, evsel) || +perf_evsel__init_augmented_syscall_tp_args (evsel)) + goto out; + evsel->handler = trace__sys_enter; }if (strstarts (perf_evsel__name (evsel),"syscalls:sys_exit_" )) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 11/107 perf augmented_raw_syscalls: Add handler for "openat"
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
I.e. for a syscall that has its second argument being a string, its difficult these days to find 'open' being used in the wild :-)
--- tools/perf/builtin-trace.c | 1 + .../perf/examples/bpf/augmented_raw_syscalls.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)
tools/perf/builtin-trace.c +1 -0
@@ -836,6 +836,7 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "openat", + .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_openat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "perf_event_open",
tools/perf/examples/bpf/augmented_raw_syscalls.c +17 -0
@@ -131,6 +131,23 @@ int sys_enter_open(struct syscall_enter_args *args)return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); } +SEC("!syscalls:sys_enter_openat") +int sys_enter_openat (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +const void *filename_arg = (const void *)args->args[1 ]; +unsigned int len =sizeof (augmented_args->args); + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + + len +=augmented_filename__read (&augmented_args->filename, filename_arg,sizeof (augmented_args->filename.value)); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +} + SEC("raw_syscalls:sys_enter")int sys_enter (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 12/107 perf augmented_raw_syscalls: Switch to using BPF_MAP_TYPE_PROG_ARRAY
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Trying to control what arguments to copy, which ones were strings, etc all from userspace via maps went nowhere, lots of difficulties to get the verifier satisfied, so use what the fine BPF guys designed for such a syscall handling mechanism: bpf_tail_call + BPF_MAP_TYPE_PROG_ARRAY.
The series leading to this should have explained it thoroughly, but the end result, explained via gdb should help understand this:
Breakpoint 1, syscall_arg__scnprintf_filename (bf=0xc002b1 "", size=2031, arg=0x7fffffff7970) at builtin-trace.c:1268
1268 {
(gdb) n
1269 unsigned long ptr = arg->val;
(gdb) n
1271 if (arg->augmented.args)
(gdb) n
1272 return syscall_arg__scnprintf_augmented_string(arg, bf, size);
(gdb) s
syscall_arg__scnprintf_augmented_string (arg=0x7fffffff7970, bf=0xc002b1 "", size=2031) at builtin-trace.c:1251
1251 {
(gdb) n
1252 struct augmented_arg *augmented_arg = arg->augmented.args;
(gdb) n
1253 size_t printed = scnprintf(bf, size, "\"%.*s\"", augmented_arg->size, augmented_arg->value);
(gdb) n
1258 int consumed = sizeof(*augmented_arg) + augmented_arg->size;
(gdb) p bf
$1 = 0xc002b1 "\"/etc/ld.so.cache\""
(gdb) bt
#0 syscall_arg__scnprintf_augmented_string (arg=0x7fffffff7970, bf=0xc002b1 "\"/etc/ld.so.cache\"", size=2031) at builtin-trace.c:1258
#1 0x0000000000492634 in syscall_arg__scnprintf_filename (bf=0xc002b1 "\"/etc/ld.so.cache\"", size=2031, arg=0x7fffffff7970) at builtin-trace.c:1272
#2 0x0000000000493cd7 in syscall__scnprintf_val (sc=0xc0de68, bf=0xc002b1 "\"/etc/ld.so.cache\"", size=2031, arg=0x7fffffff7970, val=140737354091036) at builtin-trace.c:1689
#3 0x000000000049404f in syscall__scnprintf_args (sc=0xc0de68, bf=0xc002a7 "AT_FDCWD, \"/etc/ld.so.cache\"", size=2041, args=0x7ffff6cbf1ec "\234\377\377\377", augmented_args=0x7ffff6cbf21c, augmented_args_size=28, trace=0x7fffffffa170,
thread=0xbff940) at builtin-trace.c:1756
#4 0x0000000000494a97 in trace__sys_enter (trace=0x7fffffffa170, evsel=0xbe1900, event=0x7ffff6cbf1a0, sample=0x7fffffff7b00) at builtin-trace.c:1975
#5 0x0000000000496ff1 in trace__handle_event (trace=0x7fffffffa170, event=0x7ffff6cbf1a0, sample=0x7fffffff7b00) at builtin-trace.c:2685
#6 0x0000000000497edb in __trace__deliver_event (trace=0x7fffffffa170, event=0x7ffff6cbf1a0) at builtin-trace.c:3029
#7 0x000000000049801e in trace__deliver_event (trace=0x7fffffffa170, event=0x7ffff6cbf1a0) at builtin-trace.c:3056
#8 0x00000000004988de in trace__run (trace=0x7fffffffa170, argc=2, argv=0x7fffffffd660) at builtin-trace.c:3258
#9 0x000000000049c2d3 in cmd_trace (argc=2, argv=0x7fffffffd660) at builtin-trace.c:4220
#10 0x00000000004dcb6c in run_builtin (p=0xa18e00 <commands+576>, argc=5, argv=0x7fffffffd660) at perf.c:304
#11 0x00000000004dcdd9 in handle_internal_command (argc=5, argv=0x7fffffffd660) at perf.c:356
#12 0x00000000004dcf20 in run_argv (argcp=0x7fffffffd4bc, argv=0x7fffffffd4b0) at perf.c:400
#13 0x00000000004dd28c in main (argc=5, argv=0x7fffffffd660) at perf.c:522
(gdb)
(gdb) continue
Continuing.
openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3Now its a matter of automagically assigning the BPF programs copying syscall arg pointers to functions that are "open"-like (i.e. that need only the first syscall arg copied as a string), or "openat"-like (2nd arg, etc).
End result in tool output:
# perf trace -e open* ls /tmp/notthere LLVM: dumping /home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libselinux.so.1", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libcap.so.2", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libpcre2-8.so.0", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libdl.so.2", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/lib64/libpthread.so.0", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/usr/share/locale/locale.alias", O_RDONLY|O_CLOEXEC) = 3 openat(AT_FDCWD, "/usr/share/locale/en_US.UTF-8/LC_MESSAGES/coreutils.mo", O_RDONLY) = ls: cannot access '/tmp/notthere'-1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en_US.utf8/LC_MESSAGES/coreutils.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en_US/LC_MESSAGES/coreutils.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en.UTF-8/LC_MESSAGES/coreutils.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en.utf8/LC_MESSAGES/coreutils.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en/LC_MESSAGES/coreutils.mo", O_RDONLY: No such file or directory) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en_US.UTF-8/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en_US.utf8/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en_US/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en.UTF-8/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en.utf8/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/usr/share/locale/en/LC_MESSAGES/libc.mo", O_RDONLY) = -1 ENOENT (No such file or directory) #
--- .../examples/bpf/augmented_raw_syscalls.c | 127 +++--------------- 1 file changed, 16 insertions(+), 111 deletions(-)
tools/perf/examples/bpf/augmented_raw_syscalls.c +16 -111
@@ -174,131 +174,36 @@ int sys_enter(struct syscall_enter_args *args)probe_read (&augmented_args->args,sizeof (augmented_args->args), args); - syscall =bpf_map_lookup_elem (&syscalls, &augmented_args->args.syscall_nr); -if (syscall ==NULL || !syscall->enabled) -return 0 ;/* -* Yonghong and Edward Cree sayz: -* -* https://www.spinics.net/lists/netdev/msg531645.html -* -* >> R0=inv(id=0) R1=inv2 R6=ctx(id=0,off=0,imm=0) R7=inv64 R10=fp0,call_-1 -* >> 10: (bf) r1 = r6 -* >> 11: (07) r1 += 16 -* >> 12: (05) goto pc+2 -* >> 15: (79) r3 = *(u64 *)(r1 +0) -* >> dereference of modified ctx ptr R1 off=16 disallowed -* > Aha, we at least got a different error message this time. -* > And indeed llvm has done that optimisation, rather than the more obvious -* > 11: r3 = *(u64 *)(r1 +16) -* > because it wants to have lots of reads share a single insn. You may be able -* > to defeat that optimisation by adding compiler barriers, idk. Maybe someone -* > with llvm knowledge can figure out how to stop it (ideally, llvm would know -* > when it's generating for bpf backend and not do that). -O0? ¯\_(ツ)_/¯ -* -* The optimization mostly likes below: -* -* br1: -* ... -* r1 += 16 -* goto merge -* br2: -* ... -* r1 += 20 -* goto merge -* merge: -* *(u64 *)(r1 + 0) -* -* The compiler tries to merge common loads. There is no easy way to -* stop this compiler optimization without turning off a lot of other -* optimizations. The easiest way is to add barriers: -* -* __asm__ __volatile__("": : :"memory") -* -* after the ctx memory access to prevent their down stream merging. +* Jump to syscall specific augmenter, even if the default one, +* "!raw_syscalls:unaugmented" that will just return 1 to return the +* unagmented tracepoint payload. */ -/* -* For now copy just the first string arg, we need to improve the protocol -* and have more than one. -* -* Using the unrolled loop is not working, only when we do it manually, -* check this out later... - -u8 arg; -#pragma clang loop unroll(full) -for (arg = 0; arg < 6; ++arg) { -if (syscall->string_args_len[arg] != 0) { -filename_len = syscall->string_args_len[arg]; -filename_arg = (const void *)args->args[arg]; -__asm__ __volatile__("": : :"memory"); -break; -} -} - -verifier log: - -; if (syscall->string_args_len[arg] != 0) { -37: (69) r3 = *(u16 *)(r0 +2) -R0=map_value(id=0,off=0,ks=4,vs=14,imm=0) R1_w=inv0 R2_w=map_value(id=0,off=2,ks=4,vs=14,imm=0) R6=ctx(id=0,off=0,imm=0) R7=map_value(id=0,off=0,ks=4,vs=4168,imm=0) R10=fp0,call_-1 fp-8=mmmmmmmm -; if (syscall->string_args_len[arg] != 0) { -38: (55) if r3 != 0x0 goto pc+5 -R0=map_value(id=0,off=0,ks=4,vs=14,imm=0) R1=inv0 R2=map_value(id=0,off=2,ks=4,vs=14,imm=0) R3=inv0 R6=ctx(id=0,off=0,imm=0) R7=map_value(id=0,off=0,ks=4,vs=4168,imm=0) R10=fp0,call_-1 fp-8=mmmmmmmm -39: (b7) r1 = 1 -; if (syscall->string_args_len[arg] != 0) { -40: (bf) r2 = r0 -41: (07) r2 += 4 -42: (69) r3 = *(u16 *)(r0 +4) -R0=map_value(id=0,off=0,ks=4,vs=14,imm=0) R1_w=inv1 R2_w=map_value(id=0,off=4,ks=4,vs=14,imm=0) R3_w=inv0 R6=ctx(id=0,off=0,imm=0) R7=map_value(id=0,off=0,ks=4,vs=4168,imm=0) R10=fp0,call_-1 fp-8=mmmmmmmm -; if (syscall->string_args_len[arg] != 0) { -43: (15) if r3 == 0x0 goto pc+32 -R0=map_value(id=0,off=0,ks=4,vs=14,imm=0) R1=inv1 R2=map_value(id=0,off=4,ks=4,vs=14,imm=0) R3=inv(id=0,umax_value=65535,var_off=(0x0; 0xffff)) R6=ctx(id=0,off=0,imm=0) R7=map_value(id=0,off=0,ks=4,vs=4168,imm=0) R10=fp0,call_-1 fp-8=mmmmmmmm -; filename_arg = (const void *)args->args[arg]; -44: (67) r1 <<= 3 -45: (bf) r3 = r6 -46: (0f) r3 += r1 -47: (b7) r5 = 64 -48: (79) r3 = *(u64 *)(r3 +16) -dereference of modified ctx ptr R3 off=8 disallowed -processed 46 insns (limit 1000000) max_states_per_insn 0 total_states 12 peak_states 12 mark_read 7 -*/ - -#define __loop_iter (arg) \ - if (syscall->string_args_len[arg] != 0) { \ - unsigned int filename_len = syscall->string_args_len[arg]; \ - const void *filename_arg = (const void *)args->args[arg]; \ - if (filename_len <= sizeof(augmented_args->filename.value)) \ - len += augmented_filename__read(&augmented_args->filename, filename_arg, filename_len); -#define loop_iter_first () __loop_iter(0); } -#define loop_iter (arg) else __loop_iter(arg); } -#define loop_iter_last (arg) else __loop_iter(arg); __asm__ __volatile__("": : :"memory"); } - - loop_iter_first() - loop_iter(1) - loop_iter(2) - loop_iter(3) - loop_iter(4) -loop_iter_last (5 ) +bpf_tail_call (args, &syscalls_sys_enter, augmented_args->args.syscall_nr); - /* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ -return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +// If not found on the PROG_ARRAY syscalls map, then we're filtering it: +return 0 ; } SEC("raw_syscalls:sys_exit")int sys_exit (struct syscall_exit_args *args) {struct syscall_exit_args exit_args; -struct syscall *syscall;if (pid_filter__has (&pids_filtered,getpid ()))return 0 ;probe_read (&exit_args,sizeof (exit_args), args); - - syscall =bpf_map_lookup_elem (&syscalls, &exit_args.syscall_nr); -if (syscall ==NULL || !syscall->enabled) -return 0 ; - -return 1 ; +/* +* Jump to syscall specific return augmenter, even if the default one, +* "!raw_syscalls:unaugmented" that will just return 1 to return the +* unagmented tracepoint payload. +*/ +bpf_tail_call (args, &syscalls_sys_exit, exit_args.syscall_nr); +/* +* If not found on the PROG_ARRAY syscalls map, then we're filtering it: +*/ +return 0 ; }license (GPL );
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 13/107 perf augmented_raw_syscalls: Support copying two string syscall args
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Starting with the renameat and renameat2 syscall, that both receive as second and fourth parameters a pathname:
# perf trace -e rename* mv one ANOTHER LLVM: dumping /home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o mv: cannot stat 'one': No such file or directory renameat2(AT_FDCWD, "one", AT_FDCWD, "ANOTHER", RENAME_NOREPLACE) = -1 ENOENT (No such file or directory) #
Since the per CPU scratch buffer map has space for two maximum sized pathnames, the verifier is satisfied that there will be no overrun.
--- tools/perf/builtin-trace.c | 2 ++ .../examples/bpf/augmented_raw_syscalls.c | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+)
tools/perf/builtin-trace.c +2 -0
@@ -873,9 +873,11 @@ static struct syscall_fmt { { .name = "recvmsg", .arg = { [2] = { .scnprintf = SCA_MSG_FLAGS, /* flags */ }, }, }, { .name = "renameat", + .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_renameat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, }, }, { .name = "renameat2", + .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_renameat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, [4] = { .scnprintf = SCA_RENAMEAT2_FLAGS, /* flags */ }, }, },
tools/perf/examples/bpf/augmented_raw_syscalls.c +20 -0
@@ -70,6 +70,7 @@ pid_filter(pids_filtered);struct augmented_args_filename {struct syscall_enter_args args;struct augmented_filename filename; +struct augmented_filename filename2; }; bpf_map(augmented_filename_map, PERCPU_ARRAY, int, struct augmented_args_filename, 1);
@@ -148,6 +149,25 @@ int sys_enter_openat(struct syscall_enter_args *args)return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); } +SEC("!syscalls:sys_enter_renameat") +int sys_enter_renameat (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +const void *oldpath_arg = (const void *)args->args[1 ], + *newpath_arg = (const void *)args->args[3 ]; +unsigned int len =sizeof (augmented_args->args), oldpath_len; + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + + oldpath_len =augmented_filename__read (&augmented_args->filename, oldpath_arg,sizeof (augmented_args->filename.value)); + len += oldpath_len +augmented_filename__read ((void *)(&augmented_args->filename) + oldpath_len, newpath_arg,sizeof (augmented_args->filename.value)); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +} + SEC("raw_syscalls:sys_enter")int sys_enter (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 14/107 perf trace: Look for default name for entries in the syscalls prog array
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
I.e. just look for "!syscalls:sys_enter_" or "exit_" plus the syscall name, that way we need just to add entries to the augmented_raw_syscalls.c BPF source to add handlers.
--- tools/perf/builtin-trace.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
tools/perf/builtin-trace.c +19 -11
@@ -830,13 +830,11 @@ static struct syscall_fmt { { .name = "newfstatat", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, }, { .name = "open", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_open", }, .arg = { [1] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "open_by_handle_at", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "openat", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_openat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "perf_event_open",
@@ -873,7 +871,6 @@ static struct syscall_fmt { { .name = "recvmsg", .arg = { [2] = { .scnprintf = SCA_MSG_FLAGS, /* flags */ }, }, }, { .name = "renameat", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_renameat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, }, }, { .name = "renameat2",
@@ -2778,12 +2775,27 @@ static struct bpf_program *trace__find_syscall_bpf_prog(struct trace *trace, str {struct bpf_program *prog; -if (prog_name ==NULL ) +if (prog_name ==NULL ) { +char default_prog_name[256 ]; +scnprintf (default_prog_name,sizeof (default_prog_name),"!syscalls:sys_%s_%s" , type, sc->name); + prog =trace__find_bpf_program_by_title (trace, default_prog_name); +if (prog !=NULL ) + goto out_found; +if (sc->fmt && sc->fmt->alias) { +scnprintf (default_prog_name,sizeof (default_prog_name),"!syscalls:sys_%s_%s" , type, sc->fmt->alias); + prog =trace__find_bpf_program_by_title (trace, default_prog_name); +if (prog !=NULL ) + goto out_found; + } goto out_unaugmented; + } prog =trace__find_bpf_program_by_title (trace, prog_name); -if (prog !=NULL ) + +if (prog !=NULL ) { +out_found:return prog; + }pr_debug ("Couldn't find BPF prog \"%s\" to associate with syscalls:sys_%s_%s, not augmenting it\n" , prog_name, type, sc->name);
@@ -2798,12 +2810,8 @@ static void trace__init_syscall_bpf_progs(struct trace *trace, int id)if (sc ==NULL )return ; -if (sc->fmt !=NULL ) { - sc->bpf_prog.sys_enter =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_enter,"enter" ); - sc->bpf_prog.sys_exit =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_exit,"exit" ); - }else { - sc->bpf_prog.sys_enter = sc->bpf_prog.sys_exit = trace->syscalls.unaugmented_prog; - } + sc->bpf_prog.sys_enter =trace__find_syscall_bpf_prog (trace, sc, sc->fmt ? sc->fmt->bpf_prog_name.sys_enter :NULL ,"enter" ); + sc->bpf_prog.sys_exit =trace__find_syscall_bpf_prog (trace, sc, sc->fmt ? sc->fmt->bpf_prog_name.sys_exit :NULL ,"exit" ); }static int trace__bpf_prog_sys_enter_fd (struct trace *trace,int id)
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 15/107 perf augmented_raw_syscalls: Rename augmented_args_filename to augmented_args_payload
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
It'll get other stuff in there than just filenames, starting with sockaddr for 'connect' and 'bind'.
--- .../examples/bpf/augmented_raw_syscalls.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-)
tools/perf/examples/bpf/augmented_raw_syscalls.c +12 -10
@@ -67,13 +67,15 @@ struct augmented_filename {pid_filter (pids_filtered); -struct augmented_args_filename { +struct augmented_args_payload {struct syscall_enter_args args; -struct augmented_filename filename; -struct augmented_filename filename2; +struct { +struct augmented_filename filename; +struct augmented_filename filename2; + }; }; -bpf_map(augmented_filename_map, PERCPU_ARRAY, int, struct augmented_args_filename, 1); +bpf_map(augmented_args_tmp, PERCPU_ARRAY, int, struct augmented_args_payload, 1); static inline unsigned int augmented_filename__read(struct augmented_filename *augmented_filename,
@@ -111,7 +113,7 @@ int syscall_unaugmented(struct syscall_enter_args *args)/* * This will be tail_called from SEC("raw_syscalls:sys_enter"), so will find in -* augmented_filename_map what was read by that raw_syscalls:sys_enter and go +* augmented_args_tmp what was read by that raw_syscalls:sys_enter and go * on from there, reading the first syscall arg as a string, i.e. open's * filename. */
@@ -119,7 +121,7 @@ SEC("!syscalls:sys_enter_open")int sys_enter_open (struct syscall_enter_args *args) {int key =0 ; -struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key);const void *filename_arg = (const void *)args->args[0 ];unsigned int len =sizeof (augmented_args->args);
@@ -136,7 +138,7 @@ SEC("!syscalls:sys_enter_openat")int sys_enter_openat (struct syscall_enter_args *args) {int key =0 ; -struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key);const void *filename_arg = (const void *)args->args[1 ];unsigned int len =sizeof (augmented_args->args);
@@ -153,7 +155,7 @@ SEC("!syscalls:sys_enter_renameat")int sys_enter_renameat (struct syscall_enter_args *args) {int key =0 ; -struct augmented_args_filename *augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key);const void *oldpath_arg = (const void *)args->args[1 ], *newpath_arg = (const void *)args->args[3 ];unsigned int len =sizeof (augmented_args->args), oldpath_len;
@@ -171,7 +173,7 @@ int sys_enter_renameat(struct syscall_enter_args *args) SEC("raw_syscalls:sys_enter")int sys_enter (struct syscall_enter_args *args) { -struct augmented_args_filename *augmented_args; +struct augmented_args_payload *augmented_args;/* * We start len, the amount of data that will be in the perf ring * buffer, if this is not filtered out by one of pid_filter__has(),
@@ -185,7 +187,7 @@ int sys_enter(struct syscall_enter_args *args)struct syscall *syscall;int key =0 ; - augmented_args =bpf_map_lookup_elem (&augmented_filename_map, &key); + augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key);if (augmented_args ==NULL )return 1 ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 16/107 perf augmented_raw_syscalls: Augment sockaddr arg in 'connect'
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We already had a beautifier for an augmented sockaddr payload, but that was when we were hooking on each syscalls:sys_enter_foo tracepoints, since now we're almost doing that by doing a tail call from raw_syscalls:sys_enter, its almost the same, we can reuse it straight away.
# perf trace -e connec* ssh www.bla.com
connect(3</var/lib/sss/mc/passwd>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(3</var/lib/sss/mc/passwd>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(4<socket:[16604782]>, { .family: PF_LOCAL, path: /var/lib/sss/pipes/nss }, 0x6e) = 0
connect(7, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(7, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(5</etc/hosts>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(5</etc/hosts>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 0x6e) = -1 ENOENT (No such file or directory)
connect(5</etc/hosts>, { .family: PF_INET, port: 53, addr: 192.168.44.1 }, 0x10) = 0
connect(5</etc/hosts>, { .family: PF_INET, port: 22, addr: 146.112.61.108 }, 0x10) = 0
connect(5</etc/hosts>, { .family: PF_INET6, port: 22, addr: ::ffff:146.112.61.108 }, 0x1c) = 0
^C#--- .../examples/bpf/augmented_raw_syscalls.c | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-)
tools/perf/examples/bpf/augmented_raw_syscalls.c +30 -5
@@ -16,6 +16,7 @@#include <unistd.h> #include <linux/limits.h> +#include <linux/socket.h> #include <pid_filter.h> /* bpf-output associated map */
@@ -69,10 +70,13 @@ pid_filter(pids_filtered);struct augmented_args_payload {struct syscall_enter_args args; -struct { -struct augmented_filename filename; -struct augmented_filename filename2; - }; +union { +struct { +struct augmented_filename filename, + filename2; + }; +struct sockaddr_storage saddr; + }; }; bpf_map(augmented_args_tmp, PERCPU_ARRAY, int, struct augmented_args_payload, 1);
@@ -112,11 +116,32 @@ int syscall_unaugmented(struct syscall_enter_args *args) }/* -* This will be tail_called from SEC("raw_syscalls:sys_enter"), so will find in +* These will be tail_called from SEC("raw_syscalls:sys_enter"), so will find in * augmented_args_tmp what was read by that raw_syscalls:sys_enter and go * on from there, reading the first syscall arg as a string, i.e. open's * filename. */ +SEC("!syscalls:sys_enter_connect") +int sys_enter_connect (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key); +const void *sockaddr_arg = (const void *)args->args[1 ]; +unsigned int socklen = args->args[2 ]; +unsigned int len =sizeof (augmented_args->args); + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + +if (socklen >sizeof (augmented_args->saddr)) + socklen =sizeof (augmented_args->saddr); + +probe_read (&augmented_args->saddr, socklen, sockaddr_arg); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len + socklen); +} + SEC("!syscalls:sys_enter_open")int sys_enter_open (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 17/107 perf trace beauty: Make connect's addrlen be printed as an int, not hex
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
# perf trace -e connec* ssh www.bla.com
connect(3</var/lib/sss/mc/passwd>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(3</var/lib/sss/mc/passwd>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(4<socket:[16610959]>, { .family: PF_LOCAL, path: /var/lib/sss/pipes/nss }, 110) = 0
connect(7, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(7, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(5, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(5</usr/lib64/libnss_mdns4_minimal.so.2>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
connect(5</usr/lib64/libnss_mdns4_minimal.so.2>, { .family: PF_INET, port: 53, addr: 192.168.44.1 }, 16) = 0
connect(5</usr/lib64/libnss_mdns4_minimal.so.2>, { .family: PF_INET, port: 22, addr: 146.112.61.108 }, 16) = 0
connect(5</usr/lib64/libnss_mdns4_minimal.so.2>, { .family: PF_INET6, port: 22, addr: ::ffff:146.112.61.108 }, 28) = 0
^Cconnect(5</usr/lib64/libnss_mdns4_minimal.so.2>, { .family: PF_INET, port: 22, addr: 146.112.61.108 }, 16) = -1 (unknown) (INTERNAL ERROR: strerror_r(512, [buf], 128)=22)
#Argh, the SCA_FD needs to invalidate its cache when close is done...
It works if the 'close' syscall is not filtered out ;-\
# perf trace -e close,connec* ssh www.bla.com
close(3) = 0
close(3</usr/lib64/libpcre2-8.so.0.8.0>) = 0
close(3) = 0
close(3</usr/lib64/libkrb5.so.3.3>) = 0
close(3</usr/lib64/libkrb5.so.3.3>) = 0
close(3) = 0
close(3</usr/lib64/libk5crypto.so.3.1>) = 0
close(3</usr/lib64/libk5crypto.so.3.1>) = 0
close(3</usr/lib64/libcom_err.so.2.1>) = 0
close(3</usr/lib64/libcom_err.so.2.1>) = 0
close(3) = 0
close(3</usr/lib64/libkrb5support.so.0.1>) = 0
close(3</usr/lib64/libkrb5support.so.0.1>) = 0
close(3</usr/lib64/libkeyutils.so.1.8>) = 0
close(3</usr/lib64/libkeyutils.so.1.8>) = 0
close(3) = 0
close(3) = 0
close(3) = 0
close(3) = 0
close(4) = 0
close(3) = 0
close(3) = 0
connect(3</etc/nsswitch.conf>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
close(3</etc/nsswitch.conf>) = 0
connect(3</usr/lib64/libnss_sss.so.2>, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
close(3</usr/lib64/libnss_sss.so.2>) = 0
close(3</usr/lib64/libnss_sss.so.2>) = 0
close(3) = 0
close(3) = 0
connect(4<socket:[16616519]>, { .family: PF_LOCAL, path: /var/lib/sss/pipes/nss }, 110) = 0
^C
#Will disable this beautifier when 'close' is filtered out...
--- tools/perf/builtin-trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +2 -1
@@ -725,7 +725,8 @@ static struct syscall_fmt { { .name = "close", .arg = { [0] = { .scnprintf = SCA_CLOSE_FD, /* fd */ }, }, }, { .name = "connect", - .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ }, }, }, + .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ }, + [2] = { .scnprintf = SCA_INT, /* addrlen */ }, }, }, { .name = "epoll_ctl", .arg = { [1] = STRARRAY(op, epoll_ctl_ops), }, }, { .name = "eventfd2",
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 18/107 perf trace beauty: Disable fd->pathname when close() not enabled
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
As we invalidate the fd->pathname table in the SCA_CLOSE_FD beautifier, if we don't have it we may end up keeping an fd->pathname association that then gets misprinted.
The previous behaviour continues when the close() syscall is enabled, which may still be a a problem if we lose records (i.e. we may lose a 'close' record and then get that fd reused by socket()) but then the tool will notify that records are being lost and the user will be warned that some of the heuristics will fall apart.
--- tools/perf/builtin-trace.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
tools/perf/builtin-trace.c +16 -3
@@ -127,6 +127,7 @@ struct trace {unsigned int min_stack;int raw_augmented_syscalls_args_size;bool raw_augmented_syscalls; +bool fd_path_disabled;bool sort_events;bool not_ev_qualifier;bool live;
@@ -1178,7 +1179,7 @@ static const char *thread__fd_path(struct thread *thread, int fd, {struct thread_trace *ttrace =thread__priv (thread); -if (ttrace ==NULL ) +if (ttrace ==NULL || trace->fd_path_disabled)return NULL ;if (fd <0 )
@@ -2097,7 +2098,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, ret =perf_evsel__sc_tp_uint (evsel, ret, sample); -if (sc->is_open && ret >=0 && ttrace->filename.pending_open) { +if (!trace->fd_path_disabled && sc->is_open && ret >=0 && ttrace->filename.pending_open) {trace__set_fd_pathname (thread, ret, ttrace->filename.name); ttrace->filename.pending_open = false; ++trace->stats.vfs_getname;
@@ -3206,7 +3207,6 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (trace->syscalls.prog_array.sys_enter)trace__init_syscalls_bpf_prog_array_maps (trace); -if (trace->ev_qualifier_ids.nr >0 ) { err =trace__set_ev_qualifier_filter (trace);if (err <0 )
@@ -3218,6 +3218,19 @@ static int trace__run(struct trace *trace, int argc, const char **argv) } } +/* +* If the "close" syscall is not traced, then we will not have the +* opportunity to, in syscall_arg__scnprintf_close_fd() invalidate the +* fd->pathname table and were ending up showing the last value set by +* syscalls opening a pathname and associating it with a descriptor or +* reading it from /proc/pid/fd/ in cases where that doesn't make +* sense. +* +* So just disable this beautifier (SCA_FD, SCA_FDAT) when 'close' is +* not in use. +*/ + trace->fd_path_disabled = !trace__syscall_enabled (trace,syscalltbl__id (trace->sctbl,"close" )); + err =perf_evlist__apply_filters (evlist, &evsel);if (err <0 ) goto out_error_apply_filters;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 19/107 perf trace beauty: Do not try to use the fd->pathname beautifier for bind/connect fd arg
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Doesn't make sense and also we now beautify the sockaddr, which provides enough info:
# trace -e close,socket,connec* ssh www.bla.com
<SNIP>
close(5) = 0
socket(PF_INET, SOCK_DGRAM|CLOEXEC|NONBLOCK, IPPROTO_IP) = 5
connect(5, { .family: PF_INET, port: 53, addr: 192.168.44.1 }, 16) = 0
close(5) = 0
socket(PF_INET, SOCK_STREAM, IPPROTO_TCP) = 5
^C#--- tools/perf/builtin-trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +4 -2
@@ -710,7 +710,8 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_X86_ARCH_PRCTL_CODE, /* code */ }, [1] = { .scnprintf = SCA_PTR, /* arg2 */ }, }, }, { .name = "bind", - .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, }, }, + .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ }, + [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, }, }, { .name = "bpf", .arg = { [0] = STRARRAY(cmd, bpf_cmd), }, }, { .name = "brk", .hexret = true,
@@ -726,7 +727,8 @@ static struct syscall_fmt { { .name = "close", .arg = { [0] = { .scnprintf = SCA_CLOSE_FD, /* fd */ }, }, }, { .name = "connect", - .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ }, + .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ }, + [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ }, [2] = { .scnprintf = SCA_INT, /* addrlen */ }, }, }, { .name = "epoll_ctl", .arg = { [1] = STRARRAY(op, epoll_ctl_ops), }, },
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 20/107 perf trace beauty: Beautify 'sendto's sockaddr arg
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
By just writing the collector in the augmented_raw_syscalls.c BPF program:
# perf trace -e sendto
<SNIP>
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
Socket Thread/3573 sendto(247, 0x7fb32d49c000, 120, NONE, { .family: PF_UNSPEC }, NULL) = 120
DNS Res~er #18/11374 sendto(242, 0x7fb342cfe420, 20, NONE, { .family: PF_NETLINK }, 0xc) = 20
DNS Res~er #18/11374 sendto(242, 0x7fb342cfcca0, 42, MSG_NOSIGNAL, { .family: PF_UNSPEC }, NULL) = 42
DNS Res~er #18/11374 sendto(242, 0x7fb342cfcccc, 42, MSG_NOSIGNAL, { .family: PF_UNSPEC }, NULL) = 42
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
Socket Thread/3573 sendto(242, 0x7fb308bb1c08, 296, NONE, { .family: PF_UNSPEC }, NULL) = 296
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
ping/23492 sendto(3, 0x56253bbef700, 64, NONE, { .family: PF_INET, port: 0, addr: 10.10.161.32 }, 0x10) = 64
^C
#--- .../examples/bpf/augmented_raw_syscalls.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
tools/perf/examples/bpf/augmented_raw_syscalls.c +21 -0
@@ -142,6 +142,27 @@ int sys_enter_connect(struct syscall_enter_args *args)return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len + socklen); } +SEC("!syscalls:sys_enter_sendto") +int sys_enter_sendto (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key); +const void *sockaddr_arg = (const void *)args->args[4 ]; +unsigned int socklen = args->args[5 ]; +unsigned int len =sizeof (augmented_args->args); + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + +if (socklen >sizeof (augmented_args->saddr)) + socklen =sizeof (augmented_args->saddr); + +probe_read (&augmented_args->saddr, socklen, sockaddr_arg); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len + socklen); +} + SEC("!syscalls:sys_enter_open")int sys_enter_open (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 21/107 perf trace beauty: Beautify bind's sockaddr arg
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
By reusing the "connect" BPF collector.
Testing it system wide and stopping/starting sshd:
# perf trace -e bind
LLVM: dumping /home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o
DNS Res~er #18/15132 bind(243, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #19/4833 bind(247, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #19/4833 bind(238, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #18/15132 bind(243, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #18/10327 bind(258, { .family: PF_NETLINK }, 12) = 0
:6507/6507 bind(24, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #19/4833 bind(238, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #18/15132 bind(242, { .family: PF_NETLINK }, 12) = 0
sshd/6514 bind(3, { .family: PF_NETLINK }, 12) = 0
sshd/6514 bind(5, { .family: PF_INET, port: 22, addr: 0.0.0.0 }, 16) = 0
sshd/6514 bind(7, { .family: PF_INET6, port: 22, addr: :: }, 28) = 0
DNS Res~er #18/10327 bind(229, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #18/15132 bind(231, { .family: PF_NETLINK }, 12) = 0
DNS Res~er #19/4833 bind(229, { .family: PF_NETLINK }, 12) = 0
^C#--- tools/perf/builtin-trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +3 -1
@@ -710,8 +710,10 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_X86_ARCH_PRCTL_CODE, /* code */ }, [1] = { .scnprintf = SCA_PTR, /* arg2 */ }, }, }, { .name = "bind", + .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_connect", }, .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ }, - [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, }, }, + [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, + [2] = { .scnprintf = SCA_INT, /* addrlen */ }, }, }, { .name = "bpf", .arg = { [0] = STRARRAY(cmd, bpf_cmd), }, }, { .name = "brk", .hexret = true,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 22/107 perf trace beauty: Add BPF augmenter for the 'rename' syscall
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
I.e. two strings:
# perf trace -e rename
systemd/1 rename("/run/systemd/units/.#invocation:dnf-makecache.service970761b7f2840dcc", "/run/systemd/units/invocation:dnf-makecache.service") = 0
systemd-journa/715 rename("/run/systemd/journal/streams/.#9:17539785BJDblc", "/run/systemd/journal/streams/9:17539785") = 0
mv/1936 rename("/tmp/build/perf/fd/.array.o.tmp", "/tmp/build/perf/fd/.array.o.cmd") = 0
sh/1949 rename("/tmp/build/perf/.cpu.o.tmp", "/tmp/build/perf/.cpu.o.cmd") = 0
mv/1954 rename("/tmp/build/perf/fs/.tracing_path.o.tmp", "/tmp/build/perf/fs/.tracing_path.o.cmd") = 0
mv/1963 rename("/tmp/build/perf/common-cmds.h+", "/tmp/build/perf/common-cmds.h") = 0
:1975/1975 rename("/tmp/build/perf/.exec-cmd.o.tmp", "/tmp/build/perf/.exec-cmd.o.cmd") = 0
mv/1979 rename("/tmp/build/perf/fs/.fs.o.tmp", "/tmp/build/perf/fs/.fs.o.cmd") = 0
mv/2005 rename("/tmp/build/perf/.debug.o.tmp", "/tmp/build/perf/.debug.o.cmd") = 0
mv/2012 rename("/tmp/build/perf/.str_error_r.o.tmp", "/tmp/build/perf/.str_error_r.o.cmd") = 0
mv/2019 rename("/tmp/build/perf/.help.o.tmp", "/tmp/build/perf/.help.o.cmd") = 0
mv/2031 rename("/tmp/build/perf/.trace-seq.o.tmp", "/tmp/build/perf/.trace-seq.o.cmd") = 0
make/2038 ... [continued]: rename()) = 0
:2038/2038 rename("/tmp/build/perf/.event-plugin.o.tmp", "/tmp/build/perf/.event-plugin.o.cmd") ...
ar/2035 rename("/tmp/build/perf/stzwBX3a", "/tmp/build/perf/libapi.a") = 0
mv/2051 rename("/tmp/build/perf/.parse-utils.o.tmp", "/tmp/build/perf/.parse-utils.o.cmd") = 0
mv/2069 rename("/tmp/build/perf/.subcmd-config.o.tmp", "/tmp/build/perf/.subcmd-config.o.cmd") = 0
make/2080 rename("/tmp/build/perf/.parse-filter.o.tmp", "/tmp/build/perf/.parse-filter.o.cmd") = 0
mv/2099 rename("/tmp/build/perf/.pager.o.tmp", "/tmp/build/perf/.pager.o.cmd") = 0
:2124/2124 rename("/tmp/build/perf/.sigchain.o.tmp", "/tmp/build/perf/.sigchain.o.cmd") = 0
make/2140 rename("/tmp/build/perf/.event-parse.o.tmp", "/tmp/build/perf/.event-parse.o.cmd") = 0
mv/2164 rename("/tmp/build/perf/.kbuffer-parse.o.tmp", "/tmp/build/perf/.kbuffer-parse.o.cmd") = 0
sh/2174 rename("/tmp/build/perf/.run-command.o.tmp", "/tmp/build/perf/.run-command.o.cmd") = 0
mv/2190 rename("/tmp/build/perf/.tep_strerror.o.tmp", "/tmp/build/perf/.tep_strerror.o.cmd") = 0
:2261/2261 rename("/tmp/build/perf/.event-parse-api.o.tmp", "/tmp/build/perf/.event-parse-api.o.cmd") = 0
:2480/2480 rename("/tmp/build/perf/stLv3kG2", "/tmp/build/perf/libtraceevent.a") = 0
^C#--- .../examples/bpf/augmented_raw_syscalls.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/perf/examples/bpf/augmented_raw_syscalls.c +19 -0
@@ -197,6 +197,25 @@ int sys_enter_openat(struct syscall_enter_args *args)return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); } +SEC("!syscalls:sys_enter_rename") +int sys_enter_rename (struct syscall_enter_args *args) +{ +int key =0 ; +struct augmented_args_payload *augmented_args =bpf_map_lookup_elem (&augmented_args_tmp, &key); +const void *oldpath_arg = (const void *)args->args[0 ], + *newpath_arg = (const void *)args->args[1 ]; +unsigned int len =sizeof (augmented_args->args), oldpath_len; + +if (augmented_args ==NULL ) +return 1 ;/* Failure: don't filter */ + + oldpath_len =augmented_filename__read (&augmented_args->filename, oldpath_arg,sizeof (augmented_args->filename.value)); + len += oldpath_len +augmented_filename__read ((void *)(&augmented_args->filename) + oldpath_len, newpath_arg,sizeof (augmented_args->filename.value)); + +/* If perf_event_output fails, return non-zero so that it gets recorded unaugmented */ +return perf_event_output (args, &__augmented_syscalls__,BPF_F_CURRENT_CPU , augmented_args, len); +} + SEC("!syscalls:sys_enter_renameat")int sys_enter_renameat (struct syscall_enter_args *args) {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 23/107 perf trace: Forward error codes when trying to read syscall info
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We iterate thru the syscall table produced from the kernel syscall tables reading info, propagate the error and add to the debug message.
This helps in fixing further bugs, such as failing to read the "sendfile" syscall info when it really should try the aliasm "sendfile64".
Problems reading syscall 40: 2 (No such file or directory)(sendfile) information
# grep sendfile /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c [40] = "sendfile", #
I.e. in the tracefs format file for the syscall tracepoints we have it as sendfile64:
# find /sys -type f -name format | grep sendfile /sys/kernel/debug/tracing/events/syscalls/sys_enter_sendfile64/format /sys/kernel/debug/tracing/events/syscalls/sys_exit_sendfile64/format #
But as "sendfile" in the file used to build the syscall table used in perf:
$ grep sendfile arch/x86/entry/syscalls/syscall_64.tbl 40 common sendfile __x64_sys_sendfile64 $
So we need to add, in followup patches, aliases in 'perf trace' syscall data structures to cope with thie.
--- tools/perf/builtin-trace.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
tools/perf/builtin-trace.c +9 -6
@@ -1492,13 +1492,13 @@ static int trace__read_syscall_info(struct trace *trace, int id)const char *name =syscalltbl__name (trace->sctbl, id);if (name ==NULL ) -return -1 ; +return -EINVAL ;if (id > trace->syscalls.max) {struct syscall *nsyscalls =realloc (trace->syscalls.table, (id +1 ) *sizeof (*sc));if (nsyscalls ==NULL ) -return -1 ; +return -ENOMEM ;if (trace->syscalls.max !=-1 ) { memset(nsyscalls + trace->syscalls.max + 1, 0,
@@ -1525,10 +1525,10 @@ static int trace__read_syscall_info(struct trace *trace, int id) }if (syscall__alloc_arg_fmts (sc,IS_ERR (sc->tp_format) ?6 : sc->tp_format->format.nr_fields)) -return -1 ; +return -ENOMEM ;if (IS_ERR (sc->tp_format)) -return -1 ; +return PTR_ERR (sc->tp_format); sc->args = sc->tp_format->format.fields;/*
@@ -1789,6 +1789,7 @@ typedef int (*tracepoint_handler)(struct trace *trace, struct perf_evsel *evsel,static struct syscall *trace__syscall_info (struct trace *trace,struct perf_evsel *evsel,int id) { +int err =0 ;if (id <0 ) {
@@ -1811,9 +1812,10 @@ static struct syscall *trace__syscall_info(struct trace *trace, }if ((id > trace->syscalls.max || trace->syscalls.table[id].name ==NULL ) && -trace__read_syscall_info (trace, id)) + (err =trace__read_syscall_info (trace, id)) !=0 ) goto out_cant_read; + err = -EINVAL ;if ((id > trace->syscalls.max || trace->syscalls.table[id].name ==NULL )) goto out_cant_read;
@@ -1821,7 +1823,8 @@ static struct syscall *trace__syscall_info(struct trace *trace, out_cant_read:if (verbose >0 ) { -fprintf (trace->output,"Problems reading syscall %d" , id); +char sbuf[STRERR_BUFSIZE ]; +fprintf (trace->output,"Problems reading syscall %d: %d (%s)" , id, -err,str_error_r (-err, sbuf,sizeof (sbuf)));if (id <= trace->syscalls.max && trace->syscalls.table[id].name !=NULL )fprintf (trace->output,"(%s)" , trace->syscalls.table[id].name);fputs (" information\n" , trace->output);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 24/107 perf trace: Mark syscall ids that are not allocated to avoid unnecessary error messages
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
There are holes in syscall tables with IDs not associated with any syscall, mark those when trying to read information for syscalls, which could happen when iterating thru all syscalls from 0 to the highest numbered syscall id.
--- tools/perf/builtin-trace.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
tools/perf/builtin-trace.c +19 -6
@@ -976,6 +976,7 @@ static struct syscall_fmt *syscall_fmt__find_by_alias(const char *alias)* is_exit: is this "exit" or "exit_group"? * is_open: is this "open" or "openat"? To associate the fd returned in sys_exit with the pathname in sys_enter. * args_size: sum of the sizes of the syscall arguments, anything after that is augmented stuff: pathname for openat, etc. +* nonexistent: Just a hole in the syscall table, syscall id not allocated */ struct syscall {struct tep_event *tp_format;
@@ -987,6 +988,7 @@ struct syscall { } bpf_prog;bool is_exit;bool is_open; +bool nonexistent;struct tep_format_field *args;const char *name;struct syscall_fmt *fmt;
@@ -1491,9 +1493,6 @@ static int trace__read_syscall_info(struct trace *trace, int id)struct syscall *sc;const char *name =syscalltbl__name (trace->sctbl, id); -if (name ==NULL ) -return -EINVAL ; -if (id > trace->syscalls.max) {struct syscall *nsyscalls =realloc (trace->syscalls.table, (id +1 ) *sizeof (*sc));
@@ -1512,8 +1511,15 @@ static int trace__read_syscall_info(struct trace *trace, int id) } sc = trace->syscalls.table + id; - sc->name = name; +if (sc->nonexistent) +return 0 ; +if (name ==NULL ) { + sc->nonexistent = true; +return 0 ; + } + + sc->name = name; sc->fmt =syscall_fmt__find (sc->name);snprintf (tp_name,sizeof (tp_name),"sys_enter_%s" , sc->name);
@@ -1811,14 +1817,21 @@ static struct syscall *trace__syscall_info(struct trace *trace,return NULL ; } + err = -EINVAL ; +if ((id > trace->syscalls.max || trace->syscalls.table[id].name ==NULL ) && (err =trace__read_syscall_info (trace, id)) !=0 ) goto out_cant_read; - err = -EINVAL ; -if ((id > trace->syscalls.max || trace->syscalls.table[id].name ==NULL )) +if (id > trace->syscalls.max) goto out_cant_read; +if (trace->syscalls.table[id].name ==NULL ) { +if (trace->syscalls.table[id].nonexistent) +return NULL ; + goto out_cant_read; + } +return &trace->syscalls.table[id]; out_cant_read:
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 25/107 perf trace: Preallocate the syscall table
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We'll continue reading its details from tracefs as we need it, but preallocate the whole thing otherwise we may realloc and end up with pointers to the previous buffer.
I.e. in an upcoming algorithm we'll look for syscalls that have function signatures that are similar to a given syscall to see if we can reuse its BPF augmenter, so we may be at syscall 42, having a 'struct syscall' pointing to that slot in trace->syscalls.table[] and try to read the slot for an yet unread syscall, which would realloc that table to read the info for syscall 43, say, which would trigger a realoc of trace->syscalls.table[], and then the pointer we had for syscall 42 would be pointing to the previous block of memory. b00m.
--- tools/perf/builtin-trace.c | 29 +++++++---------------------- tools/perf/util/syscalltbl.c | 1 + tools/perf/util/syscalltbl.h | 1 + 3 files changed, 9 insertions(+), 22 deletions(-)
tools/perf/builtin-trace.c +7 -22
@@ -79,7 +79,6 @@ struct trace {struct perf_tool tool;struct syscalltbl *sctbl;struct { -int max;struct syscall *table;struct bpf_map *map;struct {// per syscall BPF_MAP_TYPE_PROG_ARRAY
@@ -1493,21 +1492,10 @@ static int trace__read_syscall_info(struct trace *trace, int id)struct syscall *sc;const char *name =syscalltbl__name (trace->sctbl, id); -if (id > trace->syscalls.max) { -struct syscall *nsyscalls =realloc (trace->syscalls.table, (id +1 ) *sizeof (*sc)); - -if (nsyscalls ==NULL ) +if (trace->syscalls.table ==NULL ) { + trace->syscalls.table =calloc (trace->sctbl->syscalls.nr_entries,sizeof (*sc)); +if (trace->syscalls.table ==NULL )return -ENOMEM ; - -if (trace->syscalls.max !=-1 ) { -memset (nsyscalls + trace->syscalls.max +1 ,0 , - (id - trace->syscalls.max) *sizeof (*sc)); - }else { -memset (nsyscalls,0 , (id +1 ) *sizeof (*sc)); - } - - trace->syscalls.table = nsyscalls; - trace->syscalls.max = id; } sc = trace->syscalls.table + id;
@@ -1819,11 +1807,11 @@ static struct syscall *trace__syscall_info(struct trace *trace, err = -EINVAL ; -if ((id > trace->syscalls.max || trace->syscalls.table[id].name ==NULL ) && - (err =trace__read_syscall_info (trace, id)) !=0 ) +if (id > trace->sctbl->syscalls.max_id) goto out_cant_read; -if (id > trace->syscalls.max) +if ((trace->syscalls.table ==NULL || trace->syscalls.table[id].name ==NULL ) && + (err =trace__read_syscall_info (trace, id)) !=0 ) goto out_cant_read;if (trace->syscalls.table[id].name ==NULL ) {
@@ -1838,7 +1826,7 @@ static struct syscall *trace__syscall_info(struct trace *trace,if (verbose >0 ) {char sbuf[STRERR_BUFSIZE ];fprintf (trace->output,"Problems reading syscall %d: %d (%s)" , id, -err,str_error_r (-err, sbuf,sizeof (sbuf))); -if (id <= trace->syscalls.max && trace->syscalls.table[id].name !=NULL ) +if (id <= trace->sctbl->syscalls.max_id && trace->syscalls.table[id].name !=NULL )fprintf (trace->output,"(%s)" , trace->syscalls.table[id].name);fputs (" information\n" , trace->output); }
@@ -3922,9 +3910,6 @@ int cmd_trace(int argc, const char **argv)NULL };struct trace trace = { - .syscalls = { - . max =-1 , - }, .opts = { .target = { .uid =UINT_MAX ,
tools/perf/util/syscalltbl.c +1 -0
@@ -79,6 +79,7 @@ static int syscalltbl__init_native(struct syscalltbl *tbl)qsort (tbl->syscalls.entries, nr_entries,sizeof (struct syscall ), syscallcmp); tbl->syscalls.nr_entries = nr_entries; + tbl->syscalls.max_id = syscalltbl_native_max_id;return 0 ; }
tools/perf/util/syscalltbl.h +1 -0
@@ -6,6 +6,7 @@ struct syscalltbl {union {int audit_machine;struct { +int max_id;int nr_entries;void *entries; } syscalls;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 26/107 perf trace: Reuse BPF augmenters from syscalls with similar args signature
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We have an augmenter for the "open" syscall, which has just one pointer, in the first argument, a "const char *", so any other syscall that has just one pointer and that is the first can reuse the "open" BPF augmenter program.
Even more, syscalls that get two pointers with the first being a string can reuse "open"'s BPF augmenter till we have an augmenter that better matches that syscall with two pointers.
With this the few augmenters we have, for open (first arg is a string), openat (2nd arg is a string), renameat (2nd and 4th are strings) can be reused by a lot of syscalls, ditto for "bind" reusing "connect" because both have the 2nd argument as a sockaddr and the 3rd as its len.
Lets see how this makes the "bind" syscall reuse the "connect" BPF prog augmenter found in tools/perf/examples/bpf/augmented_raw_syscalls.c:
# perf trace -e bind,connect systemctl restart sshd
connect(3, { .family: PF_LOCAL, path: /run/systemd/private }, 23) = 0
#Oh, it just connects to some daemon, so we better do it system wide and then stop/start sshd:
# perf trace -e bind,connect
systemctl/10124 connect(3, { .family: PF_LOCAL, path: /run/systemd/private }, 23) = 0
sshd/10102 connect(7, { .family: PF_LOCAL, path: /dev/log }, 110) = 0
systemctl/10126 connect(3, { .family: PF_LOCAL, path: /run/systemd/private }, 23) = 0
systemd/10128 ... [continued]: connect()) = 0
(sshd)/10128 connect(3, { .family: PF_LOCAL, path: /run/systemd/journal/stdout }, 30) ...
sshd/10128 bind(3, { .family: PF_NETLINK }, 12) = 0
sshd/10128 connect(4, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
sshd/10128 connect(3, { .family: PF_INET6, port: 22, addr: :: }, 28) = 0
sshd/10128 connect(3, { .family: PF_UNSPEC }, 16) = 0
sshd/10128 connect(3, { .family: PF_INET, port: 22, addr: 0.0.0.0 }, 16) = 0
sshd/10128 connect(3, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
sshd/10128 connect(3, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
sshd/10128 connect(5, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
sshd/10128 connect(5, { .family: PF_LOCAL, path: /var/run/nscd/socket }, 110) = -1 ENOENT (No such file or directory)
sshd/10128 bind(4, { .family: PF_INET, port: 22, addr: 0.0.0.0 }, 16) = 0
sshd/10128 connect(6, { .family: PF_LOCAL, path: /dev/log }, 110) = 0
sshd/10128 bind(6, { .family: PF_INET6, port: 22, addr: :: }, 28) = 0
sshd/10128 connect(7, { .family: PF_LOCAL, path: /dev/log }, 110) = 0
^C#--- tools/perf/builtin-trace.c | 154 ++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +152 -2
@@ -709,7 +709,6 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_X86_ARCH_PRCTL_CODE, /* code */ }, [1] = { .scnprintf = SCA_PTR, /* arg2 */ }, }, }, { .name = "bind", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_connect", }, .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ }, [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, [2] = { .scnprintf = SCA_INT, /* addrlen */ }, }, },
@@ -879,7 +878,6 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, }, }, { .name = "renameat2", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_renameat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, [4] = { .scnprintf = SCA_RENAMEAT2_FLAGS, /* flags */ }, }, },
@@ -2910,6 +2908,94 @@ static int trace__init_syscalls_bpf_map(struct trace *trace)return __trace__init_syscalls_bpf_map (trace, enabled); } +static struct bpf_program *trace__find_usable_bpf_prog_entry (struct trace *trace,struct syscall *sc) +{ +struct tep_format_field *field, *candidate_field; +int id; + +/* +* We're only interested in syscalls that have a pointer: +*/ +for (field = sc->args; field; field = field->next) { +if (field->flags &TEP_FIELD_IS_POINTER ) + goto try_to_find_pair; + } + +return NULL ; + +try_to_find_pair: +for (id =0 ; id < trace->sctbl->syscalls.nr_entries; ++id) { +struct syscall *pair =trace__syscall_info (trace,NULL , id); +struct bpf_program *pair_prog; +bool is_candidate = false; + +if (pair ==NULL || pair == sc || + pair->bpf_prog.sys_enter == trace->syscalls.unaugmented_prog) +continue ; + +for (field = sc->args, candidate_field = pair->args; + field && candidate_field; field = field->next, candidate_field = candidate_field->next) { +bool is_pointer = field->flags &TEP_FIELD_IS_POINTER , + candidate_is_pointer = candidate_field->flags &TEP_FIELD_IS_POINTER ; + +if (is_pointer) { +if (!candidate_is_pointer) { +// The candidate just doesn't copies our pointer arg, might copy other pointers we want. +continue ; + } + }else { +if (candidate_is_pointer) { +// The candidate might copy a pointer we don't have, skip it. + goto next_candidate; + } +continue ; + } + +if (strcmp (field->type, candidate_field->type)) + goto next_candidate; + + is_candidate = true; + } + +if (!is_candidate) + goto next_candidate; + +/* +* Check if the tentative pair syscall augmenter has more pointers, if it has, +* then it may be collecting that and we then can't use it, as it would collect +* more than what is common to the two syscalls. +*/ +if (candidate_field) { +for (candidate_field = candidate_field->next; candidate_field; candidate_field = candidate_field->next) +if (candidate_field->flags &TEP_FIELD_IS_POINTER ) + goto next_candidate; + } + + pair_prog = pair->bpf_prog.sys_enter; +/* +* If the pair isn't enabled, then its bpf_prog.sys_enter will not +* have been searched for, so search it here and if it returns the +* unaugmented one, then ignore it, otherwise we'll reuse that BPF +* program for a filtered syscall on a non-filtered one. +* +* For instance, we have "!syscalls:sys_enter_renameat" and that is +* useful for "renameat2". +*/ +if (pair_prog ==NULL ) { + pair_prog =trace__find_syscall_bpf_prog (trace, pair, pair->fmt ? pair->fmt->bpf_prog_name.sys_enter :NULL ,"enter" ); +if (pair_prog == trace->syscalls.unaugmented_prog) + goto next_candidate; + } + +pr_debug ("Reusing \"%s\" BPF sys_enter augmenter for \"%s\"\n" , pair->name, sc->name); +return pair_prog; + next_candidate: +continue ; + } + +return NULL ; +} +static int trace__init_syscalls_bpf_prog_array_maps (struct trace *trace) { int map_enter_fd = bpf_map__fd(trace->syscalls.prog_array.sys_enter),
@@ -2935,6 +3021,70 @@ static int trace__init_syscalls_bpf_prog_array_maps(struct trace *trace) break; } +/* +* Now lets do a second pass looking for enabled syscalls without +* an augmenter that have a signature that is a superset of another +* syscall with an augmenter so that we can auto-reuse it. +* +* I.e. if we have an augmenter for the "open" syscall that has +* this signature: +* +* int open(const char *pathname, int flags, mode_t mode); +* +* I.e. that will collect just the first string argument, then we +* can reuse it for the 'creat' syscall, that has this signature: +* +* int creat(const char *pathname, mode_t mode); +* +* and for: +* +* int stat(const char *pathname, struct stat *statbuf); +* int lstat(const char *pathname, struct stat *statbuf); +* +* Because the 'open' augmenter will collect the first arg as a string, +* and leave alone all the other args, which already helps with +* beautifying 'stat' and 'lstat''s pathname arg. +* +* Then, in time, when 'stat' gets an augmenter that collects both +* first and second arg (this one on the raw_syscalls:sys_exit prog +* array tail call, then that one will be used. +*/ +for (key =0 ; key < trace->sctbl->syscalls.nr_entries; ++key) { +struct syscall *sc =trace__syscall_info (trace,NULL , key); +struct bpf_program *pair_prog; +int prog_fd; + +if (sc ==NULL || sc->bpf_prog.sys_enter ==NULL ) +continue ; + +/* +* For now we're just reusing the sys_enter prog, and if it +* already has an augmenter, we don't need to find one. +*/ +if (sc->bpf_prog.sys_enter != trace->syscalls.unaugmented_prog) +continue ; + +/* +* Look at all the other syscalls for one that has a signature +* that is close enough that we can share: +*/ + pair_prog =trace__find_usable_bpf_prog_entry (trace, sc); +if (pair_prog ==NULL ) +continue ; + + sc->bpf_prog.sys_enter = pair_prog; + +/* +* Update the BPF_MAP_TYPE_PROG_SHARED for raw_syscalls:sys_enter +* with the fd for the program we're reusing: +*/ + prog_fd =bpf_program__fd (sc->bpf_prog.sys_enter); + err =bpf_map_update_elem (map_enter_fd, &key, &prog_fd,BPF_ANY ); +if (err) +break ; + } + +return err; }#else
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 27/107 perf trace: Add "sendfile64" alias to the "sendfile" syscall
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We were looking in tracefs for:
/sys/kernel/debug/tracing/events/syscalls/sys_enter_sendfile/format when
what is there is just
/sys/kernel/debug/tracing/events/syscalls/sys_enter_sendfile/format
Its the same id, 40 in x86_64, so just add an alias and let the existing logic take care of that.
--- tools/perf/builtin-trace.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/builtin-trace.c +1 -0
@@ -895,6 +895,7 @@ static struct syscall_fmt { .arg = { [0] = { .scnprintf = SCA_SECCOMP_OP, /* op */ }, [1] = { .scnprintf = SCA_SECCOMP_FLAGS, /* flags */ }, }, }, { .name = "select", .timeout = true, }, + { .name = "sendfile", .alias = "sendfile64", }, { .name = "sendmmsg", .arg = { [3] = { .scnprintf = SCA_MSG_FLAGS, /* flags */ }, }, }, { .name = "sendmsg",
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 28/107 perf stat: Move loaded out of struct perf_counts_values
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Because we will make struct perf_counts_values public in following patches and 'loaded' is implementation related.
No functional change is expected.
--- tools/perf/builtin-stat.c | 4 ++-- tools/perf/util/counts.c | 11 +++++++++++ tools/perf/util/counts.h | 14 +++++++++++++- tools/perf/util/evsel.c | 3 ++- 4 files changed, 28 insertions(+), 4 deletions(-)
tools/perf/builtin-stat.c +2 -2
@@ -287,7 +287,7 @@ static int read_counter(struct perf_evsel *counter, struct timespec *rs)* The leader's group read loads data into its group members * (via perf_evsel__read_counter) and sets threir count->loaded. */ -if (!count->loaded && +if (!perf_counts__is_loaded (counter->counts, cpu, thread) &&read_single_counter (counter, cpu, thread, rs)) { counter->counts->scaled =-1 ;perf_counts (counter->counts, cpu, thread)->ena =0 ;
@@ -295,7 +295,7 @@ static int read_counter(struct perf_evsel *counter, struct timespec *rs)return -1 ; } - count->loaded = false; +perf_counts__set_loaded (counter->counts, cpu, thread, false);if (STAT_RECORD ) {if (perf_evsel__write_stat_event (counter, cpu, thread, count)) {
tools/perf/util/counts.c +11 -0
@@ -19,6 +19,15 @@ struct perf_counts *perf_counts__new(int ncpus, int nthreads) } counts->values = values; + + values =xyarray__new (ncpus, nthreads,sizeof (bool )); +if (!values) { +xyarray__delete (counts->values); +free (counts); +return NULL ; + } + + counts->loaded = values; }return counts;
@@ -27,6 +36,7 @@ struct perf_counts *perf_counts__new(int ncpus, int nthreads)void perf_counts__delete (struct perf_counts *counts) {if (counts) { +xyarray__delete (counts->loaded);xyarray__delete (counts->values);free (counts); }
@@ -34,6 +44,7 @@ void perf_counts__delete(struct perf_counts *counts)static void perf_counts__reset (struct perf_counts *counts) { +xyarray__reset (counts->loaded);xyarray__reset (counts->values); }
tools/perf/util/counts.h +13 -1
@@ -13,13 +13,13 @@ struct perf_counts_values { };u64 values[3 ]; }; -bool loaded; };struct perf_counts {s8 scaled;struct perf_counts_values aggr;struct xyarray *values; +struct xyarray *loaded; };
@@ -29,6 +29,18 @@ perf_counts(struct perf_counts *counts, int cpu, int thread)return xyarray__entry (counts->values, cpu, thread); } +static inline bool +perf_counts__is_loaded (struct perf_counts *counts,int cpu,int thread) +{ +return *((bool *)xyarray__entry (counts->loaded, cpu, thread)); +} + +static inline void +perf_counts__set_loaded (struct perf_counts *counts,int cpu,int thread,bool loaded) +{ + *((bool *)xyarray__entry (counts->loaded, cpu, thread)) = loaded; +} +struct perf_counts *perf_counts__new (int ncpus,int nthreads);void perf_counts__delete (struct perf_counts *counts);
tools/perf/util/evsel.c +2 -1
@@ -1439,7 +1439,8 @@ perf_evsel__set_count(struct perf_evsel *counter, int cpu, int thread, count->val = val; count->ena = ena; count->run = run; - count->loaded = true; + +perf_counts__set_loaded (counter->counts, cpu, thread, true); } static int
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 29/107 perf cpu_map: Rename struct cpu_map to struct perf_cpu_map
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename struct cpu_map to struct perf_cpu_map, so it could be part of libperf.
Committer notes:
Added fixes for arm64, provided by Jiri.
--- tools/perf/arch/arm/util/cs-etm.c | 16 ++-- tools/perf/arch/arm64/util/header.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 2 +- tools/perf/bench/epoll-ctl.c | 4 +- tools/perf/bench/epoll-wait.c | 4 +- tools/perf/bench/futex-hash.c | 2 +- tools/perf/bench/futex-lock-pi.c | 4 +- tools/perf/bench/futex-requeue.c | 4 +- tools/perf/bench/futex-wake-parallel.c | 4 +- tools/perf/bench/futex-wake.c | 4 +- tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-ftrace.c | 6 +- tools/perf/builtin-sched.c | 8 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-stat.c | 46 +++++------ tools/perf/tests/bitmap.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/cpumap.c | 8 +- tools/perf/tests/event-times.c | 4 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mem2node.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/topology.c | 4 +- tools/perf/util/cpumap.c | 78 +++++++++---------- tools/perf/util/cpumap.h | 52 ++++++------- tools/perf/util/cputopo.c | 4 +- tools/perf/util/env.h | 2 +- tools/perf/util/event.c | 18 ++--- tools/perf/util/event.h | 8 +- tools/perf/util/evlist.c | 10 +-- tools/perf/util/evlist.h | 8 +- tools/perf/util/evsel.c | 8 +- tools/perf/util/evsel.h | 12 +-- tools/perf/util/header.c | 4 +- tools/perf/util/mmap.c | 2 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/pmu.c | 10 +-- tools/perf/util/pmu.h | 2 +- tools/perf/util/python.c | 6 +- tools/perf/util/record.c | 6 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/session.c | 2 +- tools/perf/util/stat.c | 2 +- tools/perf/util/stat.h | 6 +- tools/perf/util/svghelper.c | 2 +- 52 files changed, 198 insertions(+), 198 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +8 -8
@@ -155,8 +155,8 @@ static int cs_etm_set_option(struct auxtrace_record *itr, struct perf_evsel *evsel, u32 option) { int i, err = -EINVAL; -struct cpu_map *event_cpus = evsel->evlist->cpus; -struct cpu_map *online_cpus =cpu_map__new (NULL ); +struct perf_cpu_map *event_cpus = evsel->evlist->cpus; +struct perf_cpu_map *online_cpus =cpu_map__new (NULL );/* Set option of each CPU we have */ for (i =0 ; i <cpu__max_cpu (); i++) {
@@ -253,7 +253,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;struct perf_evsel *evsel, *cs_etm_evsel =NULL ; -struct cpu_map *cpus = evlist->cpus; +struct perf_cpu_map *cpus = evlist->cpus;bool privileged = (geteuid () ==0 ||perf_event_paranoid () <0 );int err =0 ;
@@ -489,8 +489,8 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, {int i;int etmv3 =0 , etmv4 =0 ; -struct cpu_map *event_cpus = evlist->cpus; -struct cpu_map *online_cpus =cpu_map__new (NULL ); +struct perf_cpu_map *event_cpus = evlist->cpus; +struct perf_cpu_map *online_cpus =cpu_map__new (NULL );/* cpu map is not empty, we have specific CPUs to work with */ if (!cpu_map__empty (event_cpus)) {
@@ -635,9 +635,9 @@ static int cs_etm_info_fill(struct auxtrace_record *itr,int i;u32 offset;u64 nr_cpu, type; -struct cpu_map *cpu_map; -struct cpu_map *event_cpus = session->evlist->cpus; -struct cpu_map *online_cpus =cpu_map__new (NULL ); +struct perf_cpu_map *cpu_map; +struct perf_cpu_map *event_cpus = session->evlist->cpus; +struct perf_cpu_map *online_cpus =cpu_map__new (NULL );struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
tools/perf/arch/arm64/util/header.c +1 -1
@@ -16,7 +16,7 @@ char *get_cpuid_str(struct perf_pmu *pmu)const char *sysfs =sysfs__mountpoint ();int cpu;u64 midr =0 ; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;FILE *file;if (!sysfs || !pmu || !pmu->cpus)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -50,7 +50,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe .sample_time = true, };struct thread_map *threads =NULL ; -struct cpu_map *cpus =NULL ; +struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;int err =-1 , ret, i;
tools/perf/arch/x86/util/intel-bts.c +1 -1
@@ -106,7 +106,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, container_of(itr, struct intel_bts_recording, itr);struct perf_pmu *intel_bts_pmu = btsr->intel_bts_pmu;struct perf_evsel *evsel, *intel_bts_evsel =NULL ; -const struct cpu_map *cpus = evlist->cpus; +const struct perf_cpu_map *cpus = evlist->cpus;bool privileged =geteuid () ==0 ||perf_event_paranoid () <0 ; btsr->evlist = evlist;
tools/perf/arch/x86/util/intel-pt.c +1 -1
@@ -557,7 +557,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;bool have_timing_info, need_immediate = false;struct perf_evsel *evsel, *intel_pt_evsel =NULL ; -const struct cpu_map *cpus = evlist->cpus; +const struct perf_cpu_map *cpus = evlist->cpus;bool privileged =geteuid () ==0 ||perf_event_paranoid () <0 ;u64 tsc_bit;int err;
tools/perf/bench/epoll-ctl.c +2 -2
@@ -219,7 +219,7 @@ static void init_fdmaps(struct worker *w, int pct) } } -static int do_threads (struct worker *worker,struct cpu_map *cpu) +static int do_threads (struct worker *worker,struct perf_cpu_map *cpu) {pthread_attr_t thread_attr, *attrp =NULL ;cpu_set_t cpuset;
@@ -301,7 +301,7 @@ int bench_epoll_ctl(int argc, const char **argv)int j, ret =0 ;struct sigaction act;struct worker *worker =NULL ; -struct cpu_map *cpu; +struct perf_cpu_map *cpu;struct rlimit rl, prevrl;unsigned int i;
tools/perf/bench/epoll-wait.c +2 -2
@@ -288,7 +288,7 @@ static void print_summary(void) (int) runtime.tv_sec); } -static int do_threads (struct worker *worker,struct cpu_map *cpu) +static int do_threads (struct worker *worker,struct perf_cpu_map *cpu) {pthread_attr_t thread_attr, *attrp =NULL ;cpu_set_t cpuset;
@@ -415,7 +415,7 @@ int bench_epoll_wait(int argc, const char **argv)struct sigaction act;unsigned int i;struct worker *worker =NULL ; -struct cpu_map *cpu; +struct perf_cpu_map *cpu;pthread_t wthread;struct rlimit rl, prevrl;
tools/perf/bench/futex-hash.c +1 -1
@@ -124,7 +124,7 @@ int bench_futex_hash(int argc, const char **argv)unsigned int i;pthread_attr_t thread_attr;struct worker *worker =NULL ; -struct cpu_map *cpu; +struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_hash_usage,0 );if (argc) {
tools/perf/bench/futex-lock-pi.c +2 -2
@@ -116,7 +116,7 @@ static void *workerfn(void *arg) }static void create_threads (struct worker *w,pthread_attr_t thread_attr, -struct cpu_map *cpu) +struct perf_cpu_map *cpu) {cpu_set_t cpuset;unsigned int i;
@@ -150,7 +150,7 @@ int bench_futex_lock_pi(int argc, const char **argv)unsigned int i;struct sigaction act;pthread_attr_t thread_attr; -struct cpu_map *cpu; +struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_lock_pi_usage,0 );if (argc)
tools/perf/bench/futex-requeue.c +2 -2
@@ -84,7 +84,7 @@ static void *workerfn(void *arg __maybe_unused) }static void block_threads (pthread_t *w, -pthread_attr_t thread_attr,struct cpu_map *cpu) +pthread_attr_t thread_attr,struct perf_cpu_map *cpu) {cpu_set_t cpuset;unsigned int i;
@@ -117,7 +117,7 @@ int bench_futex_requeue(int argc, const char **argv)unsigned int i, j;struct sigaction act;pthread_attr_t thread_attr; -struct cpu_map *cpu; +struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_requeue_usage,0 );if (argc)
tools/perf/bench/futex-wake-parallel.c +2 -2
@@ -138,7 +138,7 @@ static void *blocked_workerfn(void *arg __maybe_unused) }static void block_threads (pthread_t *w,pthread_attr_t thread_attr, -struct cpu_map *cpu) +struct perf_cpu_map *cpu) {cpu_set_t cpuset;unsigned int i;
@@ -224,7 +224,7 @@ int bench_futex_wake_parallel(int argc, const char **argv)struct sigaction act;pthread_attr_t thread_attr;struct thread_data *waking_worker; -struct cpu_map *cpu; +struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_wake_parallel_usage,0 );
tools/perf/bench/futex-wake.c +2 -2
@@ -90,7 +90,7 @@ static void print_summary(void) }static void block_threads (pthread_t *w, -pthread_attr_t thread_attr,struct cpu_map *cpu) +pthread_attr_t thread_attr,struct perf_cpu_map *cpu) {cpu_set_t cpuset;unsigned int i;
@@ -123,7 +123,7 @@ int bench_futex_wake(int argc, const char **argv)unsigned int i, j;struct sigaction act;pthread_attr_t thread_attr; -struct cpu_map *cpu; +struct perf_cpu_map *cpu; argc =parse_options (argc, argv, options, bench_futex_wake_usage,0 );if (argc) {
tools/perf/builtin-c2c.c +1 -1
@@ -2049,7 +2049,7 @@ static int setup_nodes(struct perf_session *session) c2c.cpu2node = cpu2node;for (node =0 ; node < c2c.nodes_cnt; node++) { -struct cpu_map *map = n[node].map; +struct perf_cpu_map *map = n[node].map;unsigned long *set; set =bitmap_alloc (c2c.cpus_cnt);
tools/perf/builtin-ftrace.c +3 -3
@@ -165,7 +165,7 @@ static int set_tracing_pid(struct perf_ftrace *ftrace)return 0 ; } -static int set_tracing_cpumask (struct cpu_map *cpumap) +static int set_tracing_cpumask (struct perf_cpu_map *cpumap) {char *cpumask;size_t mask_size;
@@ -192,7 +192,7 @@ static int set_tracing_cpumask(struct cpu_map *cpumap)static int set_tracing_cpu (struct perf_ftrace *ftrace) { -struct cpu_map *cpumap = ftrace->evlist->cpus; +struct perf_cpu_map *cpumap = ftrace->evlist->cpus;if (!target__has_cpu (&ftrace->target))return 0 ;
@@ -202,7 +202,7 @@ static int set_tracing_cpu(struct perf_ftrace *ftrace)static int reset_tracing_cpu (void ) { -struct cpu_map *cpumap =cpu_map__new (NULL ); +struct perf_cpu_map *cpumap =cpu_map__new (NULL );int ret; ret =set_tracing_cpumask (cpumap);
tools/perf/builtin-sched.c +4 -4
@@ -161,9 +161,9 @@ struct perf_sched_map {bool comp;struct thread_map *color_pids;const char *color_pids_str; -struct cpu_map *color_cpus; +struct perf_cpu_map *color_cpus;const char *color_cpus_str; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;const char *cpus_str; };
@@ -3170,7 +3170,7 @@ static int perf_sched__lat(struct perf_sched *sched)static int setup_map_cpus (struct perf_sched *sched) { -struct cpu_map *map; +struct perf_cpu_map *map; sched->max_cpu =sysconf (_SC_NPROCESSORS_CONF);
@@ -3212,7 +3212,7 @@ static int setup_color_pids(struct perf_sched *sched)static int setup_color_cpus (struct perf_sched *sched) { -struct cpu_map *map; +struct perf_cpu_map *map;if (!sched->map.color_cpus_str)return 0 ;
tools/perf/builtin-script.c +1 -1
@@ -1627,7 +1627,7 @@ struct perf_script {bool show_bpf_events;bool allocated;bool per_event_dump; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;int name_width;const char *time_str;
tools/perf/builtin-stat.c +23 -23
152 lines not on this page · raw message
tools/perf/tests/bitmap.c +1 -1
@@ -9,7 +9,7 @@static unsigned long *get_bitmap (const char *str,int nbits) { -struct cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =cpu_map__new (str);unsigned long *bm =NULL ;int i;
tools/perf/tests/code-reading.c +1 -1
@@ -553,7 +553,7 @@ static int do_test_code_reading(bool try_kcore) .done_cnt = 0, };struct thread_map *threads =NULL ; -struct cpu_map *cpus =NULL ; +struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;int err =-1 , ret;
tools/perf/tests/cpumap.c +4 -4
@@ -17,7 +17,7 @@ static int process_event_mask(struct perf_tool *tool __maybe_unused,struct cpu_map_event *map_event = &event->cpu_map;struct cpu_map_mask *mask;struct cpu_map_data *data; -struct cpu_map *map; +struct perf_cpu_map *map;int i; data = &map_event->data;
@@ -51,7 +51,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,struct cpu_map_event *map_event = &event->cpu_map;struct cpu_map_entries *cpus;struct cpu_map_data *data; -struct cpu_map *map; +struct perf_cpu_map *map; data = &map_event->data;
@@ -75,7 +75,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,int test__cpu_map_synthesize (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct cpu_map *cpus; +struct perf_cpu_map *cpus;/* This one is better stores in mask. */ cpus =cpu_map__new ("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" );
@@ -97,7 +97,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maystatic int cpu_map_print (const char *str) { -struct cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =cpu_map__new (str);char buf[100 ];if (!map)
tools/perf/tests/event-times.c +2 -2
@@ -110,7 +110,7 @@ static int detach__disable(struct perf_evlist *evlist)static int attach__cpu_disabled (struct perf_evlist *evlist) {struct perf_evsel *evsel =perf_evlist__last (evlist); -struct cpu_map *cpus; +struct perf_cpu_map *cpus;int err;pr_debug ("attaching to CPU 0 as enabled\n" );
@@ -139,7 +139,7 @@ static int attach__cpu_disabled(struct perf_evlist *evlist)static int attach__cpu_enabled (struct perf_evlist *evlist) {struct perf_evsel *evsel =perf_evlist__last (evlist); -struct cpu_map *cpus; +struct perf_cpu_map *cpus;int err;pr_debug ("attaching to CPU 0 as enabled\n" );
tools/perf/tests/event_update.c +1 -1
@@ -61,7 +61,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused, {struct event_update_event *ev = (struct event_update_event *) event;struct event_update_event_cpus *ev_data; -struct cpu_map *map; +struct perf_cpu_map *map; ev_data = (struct event_update_event_cpus *) ev->data;
tools/perf/tests/keep-tracking.c +1 -1
@@ -66,7 +66,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un }, };struct thread_map *threads =NULL ; -struct cpu_map *cpus =NULL ; +struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;int found, err =-1 ;
tools/perf/tests/mem2node.c +1 -1
@@ -19,7 +19,7 @@ static struct node {static unsigned long *get_bitmap (const char *str,int nbits) { -struct cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =cpu_map__new (str);unsigned long *bm =NULL ;int i;
tools/perf/tests/mmap-basic.c +1 -1
@@ -28,7 +28,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuseint err =-1 ;union perf_event *event;struct thread_map *threads; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct perf_evlist *evlist;cpu_set_t cpu_set;const char *syscall_names[] = {"getsid" ,"getppid" ,"getpgid" , };
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -20,7 +20,7 @@int test__openat_syscall_event_on_all_cpus (struct test *test__maybe_unused ,int subtest__maybe_unused ) {int err =-1 , fd, cpu; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct perf_evsel *evsel;unsigned int nr_openat_calls =111 , i;cpu_set_t cpu_set;
tools/perf/tests/sw-clock.c +1 -1
@@ -37,7 +37,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) .disabled = 1, .freq = 1, }; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;struct perf_mmap *md;
tools/perf/tests/switch-tracking.c +1 -1
@@ -328,7 +328,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ }, };struct thread_map *threads =NULL ; -struct cpu_map *cpus =NULL ; +struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel, *cpu_clocks_evsel, *cycles_evsel;struct perf_evsel *switch_evsel, *tracking_evsel;
tools/perf/tests/task-exit.c +1 -1
@@ -45,7 +45,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused };const char *argv[] = {"true" ,NULL };char sbuf[STRERR_BUFSIZE ]; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;struct perf_mmap *md;
tools/perf/tests/topology.c +2 -2
@@ -57,7 +57,7 @@ static int session_write_header(char *path)return 0 ; } -static int check_cpu_topology (char *path,struct cpu_map *map) +static int check_cpu_topology (char *path,struct perf_cpu_map *map) {struct perf_session *session;struct perf_data data = {
@@ -116,7 +116,7 @@ static int check_cpu_topology(char *path, struct cpu_map *map)int test__session_topology (struct test *test__maybe_unused ,int subtest__maybe_unused ) {char path[PATH_MAX ]; -struct cpu_map *map; +struct perf_cpu_map *map;int ret =TEST_FAIL ;TEST_ASSERT_VAL ("can't get templ file" , !get_temp (path));
tools/perf/util/cpumap.c +39 -39
245 lines not on this page · raw message
tools/perf/util/cpumap.h +26 -26
84 lines not on this page · raw message
tools/perf/util/cputopo.c +2 -2
@@ -176,7 +176,7 @@ struct cpu_topology *cpu_topology__new(void)size_t sz;long ncpus;int ret =-1 ; -struct cpu_map *map; +struct perf_cpu_map *map;bool has_die =has_die_topology (); ncpus =cpu__max_present_cpu ();
@@ -289,7 +289,7 @@ static int load_numa_node(struct numa_topology_node *node, int nr)struct numa_topology *numa_topology__new (void ) { -struct cpu_map *node_map =NULL ; +struct perf_cpu_map *node_map =NULL ;struct numa_topology *tp =NULL ;char path[MAXPATHLEN ];char *buf =NULL ;
tools/perf/util/env.h +1 -1
@@ -27,7 +27,7 @@ struct numa_node {u32 node;u64 mem_total;u64 mem_free; -struct cpu_map *map; +struct perf_cpu_map *map; };struct memory_node {
tools/perf/util/event.c +9 -9
@@ -1008,7 +1008,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool, }static void synthesize_cpus (struct cpu_map_entries *cpus, -struct cpu_map *map) +struct perf_cpu_map *map) {int i;
@@ -1019,7 +1019,7 @@ static void synthesize_cpus(struct cpu_map_entries *cpus, }static void synthesize_mask (struct cpu_map_mask *mask, -struct cpu_map *map,int max) +struct perf_cpu_map *map,int max) {int i;
@@ -1030,12 +1030,12 @@ static void synthesize_mask(struct cpu_map_mask *mask,set_bit (map->map[i], mask->mask); } -static size_t cpus_size (struct cpu_map *map) +static size_t cpus_size (struct perf_cpu_map *map) {return sizeof (struct cpu_map_entries ) + map->nr *sizeof (u16); } -static size_t mask_size (struct cpu_map *map,int *max) +static size_t mask_size (struct perf_cpu_map *map,int *max) {int i;
@@ -1052,7 +1052,7 @@ static size_t mask_size(struct cpu_map *map, int *max)return sizeof (struct cpu_map_mask ) +BITS_TO_LONGS (*max) *sizeof (long ); } -void *cpu_map_data__alloc (struct cpu_map *map,size_t *size,u16 *type,int *max) +void *cpu_map_data__alloc (struct perf_cpu_map *map,size_t *size,u16 *type,int *max) {size_t size_cpus, size_mask;bool is_dummy =cpu_map__empty (map);
@@ -1086,7 +1086,7 @@ void *cpu_map_data__alloc(struct cpu_map *map, size_t *size, u16 *type, int *maxreturn zalloc (*size); } -void cpu_map_data__synthesize (struct cpu_map_data *data,struct cpu_map *map, +void cpu_map_data__synthesize (struct cpu_map_data *data,struct perf_cpu_map *map,u16 type,int max) { data->type = type;
@@ -1102,7 +1102,7 @@ void cpu_map_data__synthesize(struct cpu_map_data *data, struct cpu_map *map, }; } -static struct cpu_map_event *cpu_map_event__new (struct cpu_map *map) +static struct cpu_map_event *cpu_map_event__new (struct perf_cpu_map *map) {size_t size =sizeof (struct cpu_map_event );struct cpu_map_event *event;
@@ -1122,7 +1122,7 @@ static struct cpu_map_event* cpu_map_event__new(struct cpu_map *map) }int perf_event__synthesize_cpu_map (struct perf_tool *tool, -struct cpu_map *map, +struct perf_cpu_map *map,perf_event__handler_t process,struct machine *machine) {
@@ -1393,7 +1393,7 @@ size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp)size_t perf_event__fprintf_cpu_map (union perf_event *event,FILE *fp) { -struct cpu_map *cpus =cpu_map__new_data (&event->cpu_map.data); +struct perf_cpu_map *cpus =cpu_map__new_data (&event->cpu_map.data);size_t ret; ret =fprintf (fp,": " );
tools/perf/util/event.h +4 -4
@@ -675,7 +675,7 @@ void perf_event__print_totals(void);struct perf_tool ;struct thread_map ; -struct cpu_map ; +struct perf_cpu_map ;struct perf_stat_config ;struct perf_counts_values ;
@@ -693,7 +693,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,perf_event__handler_t process, struct machine *machine);int perf_event__synthesize_cpu_map (struct perf_tool *tool, -struct cpu_map *cpus, +struct perf_cpu_map *cpus,perf_event__handler_t process,struct machine *machine); int perf_event__synthesize_threads(struct perf_tool *tool,
@@ -844,8 +844,8 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp);int kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr); -void *cpu_map_data__alloc (struct cpu_map *map,size_t *size,u16 *type,int *max); -void cpu_map_data__synthesize (struct cpu_map_data *data,struct cpu_map *map, +void *cpu_map_data__alloc (struct perf_cpu_map *map,size_t *size,u16 *type,int *max); +void cpu_map_data__synthesize (struct cpu_map_data *data,struct perf_cpu_map *map,u16 type,int max);void event_attr_init (struct perf_event_attr *attr);
tools/perf/util/evlist.c +5 -5
@@ -41,7 +41,7 @@ int sigqueue(pid_t pid, int sig, const union sigval value);#define FD (e, x, y) (*(int *)xyarray__entry(e->fd, x, y))#define SID (e, x, y) xyarray__entry(e->sample_id, x, y) -void perf_evlist__init (struct perf_evlist *evlist,struct cpu_map *cpus, +void perf_evlist__init (struct perf_evlist *evlist,struct perf_cpu_map *cpus,struct thread_map *threads) {int i;
@@ -1012,7 +1012,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, int comp_level) {struct perf_evsel *evsel; -const struct cpu_map *cpus = evlist->cpus; +const struct perf_cpu_map *cpus = evlist->cpus;const struct thread_map *threads = evlist->threads;/* * Delay setting mp.prot: set it before calling perf_mmap__mmap.
@@ -1058,7 +1058,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages)int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) {bool all_threads = (target->per_thread && target->system_wide); -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;/*
@@ -1104,7 +1104,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)return -1 ; } -void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +void perf_evlist__set_maps (struct perf_evlist *evlist,struct perf_cpu_map *cpus,struct thread_map *threads) {/*
@@ -1358,7 +1358,7 @@ void perf_evlist__close(struct perf_evlist *evlist)static int perf_evlist__create_syswide_maps (struct perf_evlist *evlist) { -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;int err = -ENOMEM ;
tools/perf/util/evlist.h +4 -4
@@ -18,7 +18,7 @@struct pollfd ;struct thread_map ; -struct cpu_map ; +struct perf_cpu_map ;struct record_opts ;#define PERF_EVLIST__HLIST_BITS 8
@@ -45,7 +45,7 @@ struct perf_evlist {struct perf_mmap *mmap;struct perf_mmap *overwrite_mmap;struct thread_map *threads; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct perf_evsel *selected;struct events_stats stats;struct perf_env *env;
@@ -68,7 +68,7 @@ struct perf_evsel_str_handler {struct perf_evlist *perf_evlist__new (void );struct perf_evlist *perf_evlist__new_default (void );struct perf_evlist *perf_evlist__new_dummy (void ); -void perf_evlist__init (struct perf_evlist *evlist,struct cpu_map *cpus, +void perf_evlist__init (struct perf_evlist *evlist,struct perf_cpu_map *cpus,struct thread_map *threads);void perf_evlist__exit (struct perf_evlist *evlist);void perf_evlist__delete (struct perf_evlist *evlist);
@@ -194,7 +194,7 @@ int perf_evlist__enable_event_idx(struct perf_evlist *evlist,void perf_evlist__set_selected (struct perf_evlist *evlist,struct perf_evsel *evsel); -void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +void perf_evlist__set_maps (struct perf_evlist *evlist,struct perf_cpu_map *cpus,struct thread_map *threads);int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target);int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel);
tools/perf/util/evsel.c +4 -4
@@ -1825,7 +1825,7 @@ static int perf_event_open(struct perf_evsel *evsel,return fd; } -int perf_evsel__open (struct perf_evsel *evsel,struct cpu_map *cpus, +int perf_evsel__open (struct perf_evsel *evsel,struct perf_cpu_map *cpus,struct thread_map *threads) {int cpu, thread, nthreads;
@@ -1837,7 +1837,7 @@ int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,return -EINVAL ;if (cpus ==NULL ) { -static struct cpu_map *empty_cpu_map; +static struct perf_cpu_map *empty_cpu_map;if (empty_cpu_map ==NULL ) { empty_cpu_map =cpu_map__dummy_new ();
@@ -2084,7 +2084,7 @@ void perf_evsel__close(struct perf_evsel *evsel) }int perf_evsel__open_per_cpu (struct perf_evsel *evsel, -struct cpu_map *cpus) +struct perf_cpu_map *cpus) {return perf_evsel__open (evsel, cpus,NULL ); }
@@ -3064,7 +3064,7 @@ static int store_evsel_ids(struct perf_evsel *evsel, struct perf_evlist *evlist)int perf_evsel__store_ids (struct perf_evsel *evsel,struct perf_evlist *evlist) { -struct cpu_map *cpus = evsel->cpus; +struct perf_cpu_map *cpus = evsel->cpus;struct thread_map *threads = evsel->threads;if (perf_evsel__alloc_id (evsel, cpus->nr, threads->nr))
tools/perf/util/evsel.h +6 -6
@@ -124,8 +124,8 @@ struct perf_evsel {u64 db_id;struct cgroup *cgrp;void *handler; -struct cpu_map *cpus; -struct cpu_map *own_cpus; +struct perf_cpu_map *cpus; +struct perf_cpu_map *own_cpus;struct thread_map *threads;unsigned int sample_size;int id_pos;
@@ -192,12 +192,12 @@ struct perf_missing_features {extern struct perf_missing_features perf_missing_features; -struct cpu_map ; +struct perf_cpu_map ;struct target ;struct thread_map ;struct record_opts ; -static inline struct cpu_map *perf_evsel__cpus (struct perf_evsel *evsel) +static inline struct perf_cpu_map *perf_evsel__cpus (struct perf_evsel *evsel) {return evsel->cpus; }
@@ -300,10 +300,10 @@ int perf_evsel__enable(struct perf_evsel *evsel);int perf_evsel__disable (struct perf_evsel *evsel);int perf_evsel__open_per_cpu (struct perf_evsel *evsel, -struct cpu_map *cpus); +struct perf_cpu_map *cpus);int perf_evsel__open_per_thread (struct perf_evsel *evsel,struct thread_map *threads); -int perf_evsel__open (struct perf_evsel *evsel,struct cpu_map *cpus, +int perf_evsel__open (struct perf_evsel *evsel,struct perf_cpu_map *cpus,struct thread_map *threads);void perf_evsel__close (struct perf_evsel *evsel);
tools/perf/util/header.c +2 -2
@@ -3886,7 +3886,7 @@ size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)struct event_update_event *ev = &event->event_update;struct event_update_event_scale *ev_scale;struct event_update_event_cpus *ev_cpus; -struct cpu_map *map; +struct perf_cpu_map *map;size_t ret; ret =fprintf (fp,"\n... id: %" PRIu64"\n" , ev->id);
@@ -4054,7 +4054,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,struct event_update_event_cpus *ev_cpus;struct perf_evlist *evlist;struct perf_evsel *evsel; -struct cpu_map *map; +struct perf_cpu_map *map;if (!pevlist || *pevlist ==NULL )return -EINVAL ;
tools/perf/util/mmap.c +1 -1
@@ -325,7 +325,7 @@ void perf_mmap__munmap(struct perf_mmap *map)static void build_node_mask (int node,cpu_set_t *mask) {int c, cpu, nr_cpus; -const struct cpu_map *cpu_map =NULL ; +const struct perf_cpu_map *cpu_map =NULL ; cpu_map =cpu_map__online ();if (!cpu_map)
tools/perf/util/parse-events.c +1 -1
@@ -322,7 +322,7 @@ __add_event(struct list_head *list, int *idx, const char *cpu_list) {struct perf_evsel *evsel; -struct cpu_map *cpus = pmu ? pmu->cpus : +struct perf_cpu_map *cpus = pmu ? pmu->cpus : cpu_list ?cpu_map__new (cpu_list) :NULL ;event_attr_init (attr);
tools/perf/util/pmu.c +5 -5
@@ -572,10 +572,10 @@ static void pmu_read_sysfs(void)closedir (dir); } -static struct cpu_map *__pmu_cpumask (const char *path) +static struct perf_cpu_map *__pmu_cpumask (const char *path) {FILE *file; -struct cpu_map *cpus; +struct perf_cpu_map *cpus; file =fopen (path,"r" );if (!file)
@@ -593,10 +593,10 @@ static struct cpu_map *__pmu_cpumask(const char *path)#define CPUS_TEMPLATE_UNCORE "%s/bus/event_source/devices/%s/cpumask"#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus" -static struct cpu_map *pmu_cpumask (const char *name) +static struct perf_cpu_map *pmu_cpumask (const char *name) {char path[PATH_MAX ]; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;const char *sysfs =sysfs__mountpoint ();const char *templates[] = {CPUS_TEMPLATE_UNCORE ,
@@ -621,7 +621,7 @@ static struct cpu_map *pmu_cpumask(const char *name)static bool pmu_is_uncore (const char *name) {char path[PATH_MAX ]; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;const char *sysfs =sysfs__mountpoint ();snprintf (path,PATH_MAX ,CPUS_TEMPLATE_UNCORE , sysfs, name);
tools/perf/util/pmu.h +1 -1
@@ -28,7 +28,7 @@ struct perf_pmu {bool is_uncore;int max_precise;struct perf_event_attr *default_config; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct list_head format;/* HEAD struct perf_pmu_format -> list */ struct list_head aliases;/* HEAD struct perf_pmu_alias -> list */ struct list_head list;/* ELEM */
tools/perf/util/python.c +3 -3
@@ -536,7 +536,7 @@ static PyObject *pyrf_event__new(union perf_event *event)struct pyrf_cpu_map {PyObject_HEAD - struct cpu_map *cpus; + struct perf_cpu_map *cpus; }; static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus,
@@ -796,7 +796,7 @@ static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel, PyObject *args, PyObject *kwargs) {struct perf_evsel *evsel = &pevsel->evsel; -struct cpu_map *cpus =NULL ; +struct perf_cpu_map *cpus =NULL ;struct thread_map *threads =NULL ;PyObject *pcpus =NULL , *pthreads =NULL ;int group =0 , inherit =0 ;
@@ -865,7 +865,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs __maybe_unused) {PyObject *pcpus =NULL , *pthreads =NULL ; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;struct thread_map *threads;if (!PyArg_ParseTuple (args,"OO" , &pcpus, &pthreads))
tools/perf/util/record.c +3 -3
@@ -60,7 +60,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, int cpu, const char *str)static bool perf_probe_api (setup_probe_fn_t fn) {const char *try[] = {"cycles:u" ,"instructions:u" ,"cpu-clock:u" ,NULL }; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;int cpu, ret, i =0 ; cpus =cpu_map__new (NULL );
@@ -115,7 +115,7 @@ bool perf_can_record_cpu_wide(void) .config = PERF_COUNT_SW_CPU_CLOCK, .exclude_kernel = 1, }; -struct cpu_map *cpus; +struct perf_cpu_map *cpus;int cpu, fd; cpus =cpu_map__new (NULL );
@@ -275,7 +275,7 @@ bool perf_evlist__can_select_event(struct perf_evlist *evlist, const char *str) evsel =perf_evlist__last (temp_evlist);if (!evlist ||cpu_map__empty (evlist->cpus)) { -struct cpu_map *cpus =cpu_map__new (NULL ); +struct perf_cpu_map *cpus =cpu_map__new (NULL ); cpu = cpus ? cpus->map[0 ] :0 ;cpu_map__put (cpus);
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -1393,7 +1393,7 @@ static void python_process_stat(struct perf_stat_config *config, struct perf_evsel *counter, u64 tstamp) {struct thread_map *threads = counter->threads; -struct cpu_map *cpus = counter->cpus; +struct perf_cpu_map *cpus = counter->cpus;int cpu, thread;if (config->aggr_mode ==AGGR_GLOBAL ) {
tools/perf/util/session.c +1 -1
@@ -2273,7 +2273,7 @@ int perf_session__cpu_bitmap(struct perf_session *session, const char *cpu_list, unsigned long *cpu_bitmap) { int i, err = -1; -struct cpu_map *map; +struct perf_cpu_map *map;for (i =0 ; i <PERF_TYPE_MAX ; ++i) {struct perf_evsel *evsel;
tools/perf/util/stat.c +1 -1
@@ -215,7 +215,7 @@ static int check_per_pkg(struct perf_evsel *counter, struct perf_counts_values *vals, int cpu, bool *skip) { unsigned long *mask = counter->per_pkg_mask; -struct cpu_map *cpus =perf_evsel__cpus (counter); +struct perf_cpu_map *cpus =perf_evsel__cpus (counter);int s; *skip = false;
tools/perf/util/stat.h +3 -3
@@ -92,7 +92,7 @@ struct runtime_stat { };typedef int (*aggr_get_id_t )(struct perf_stat_config *config, -struct cpu_map *m,int cpu); +struct perf_cpu_map *m,int cpu);struct perf_stat_config {enum aggr_mode aggr_mode;
@@ -122,9 +122,9 @@ struct perf_stat_config {const char *csv_sep;struct stats *walltime_nsecs_stats;struct rusage ru_data; -struct cpu_map *aggr_map; +struct perf_cpu_map *aggr_map;aggr_get_id_t aggr_get_id; -struct cpu_map *cpus_aggr_map; +struct perf_cpu_map *cpus_aggr_map;u64 *walltime_run;struct rblist metric_events; };
tools/perf/util/svghelper.c +1 -1
@@ -728,7 +728,7 @@ static int str_to_bitmap(char *s, cpumask_t *b) {int i;int ret =0 ; -struct cpu_map *m; +struct perf_cpu_map *m;int c; m =cpu_map__new (s);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 30/107 perf tools: Rename struct thread_map to struct perf_thread_map
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename struct thread_map to struct perf_thread_map, so it could be part of libperf.
--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-sched.c | 4 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-stat.c | 4 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 4 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/mmap-thread-lookup.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/openat-syscall.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/thread-map.c | 8 +-- tools/perf/util/event.c | 6 +- tools/perf/util/event.h | 6 +- tools/perf/util/evlist.c | 10 ++-- tools/perf/util/evlist.h | 6 +- tools/perf/util/evsel.c | 10 ++-- tools/perf/util/evsel.h | 6 +- tools/perf/util/machine.c | 2 +- tools/perf/util/machine.h | 4 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/python.c | 6 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/thread_map.c | 60 +++++++++---------- tools/perf/util/thread_map.h | 40 ++++++------- 29 files changed, 102 insertions(+), 102 deletions(-)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -49,7 +49,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe }, .sample_time = true, }; -struct thread_map *threads =NULL ; +struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;
tools/perf/builtin-record.c +1 -1
@@ -1047,7 +1047,7 @@ record__finish_output(struct record *rec)static int record__synthesize_workload (struct record *rec,bool tail) {int err; -struct thread_map *thread_map; +struct perf_thread_map *thread_map;if (rec->opts.tail_synthesize != tail)return 0 ;
tools/perf/builtin-sched.c +2 -2
@@ -159,7 +159,7 @@ struct perf_sched_map {DECLARE_BITMAP (comp_cpus_mask,MAX_CPUS );int *comp_cpus;bool comp; -struct thread_map *color_pids; +struct perf_thread_map *color_pids;const char *color_pids_str;struct perf_cpu_map *color_cpus;const char *color_cpus_str;
@@ -3195,7 +3195,7 @@ static int setup_map_cpus(struct perf_sched *sched)static int setup_color_pids (struct perf_sched *sched) { -struct thread_map *map; +struct perf_thread_map *map;if (!sched->map.color_pids_str)return 0 ;
tools/perf/builtin-script.c +1 -1
@@ -1628,7 +1628,7 @@ struct perf_script {bool allocated;bool per_event_dump;struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;int name_width;const char *time_str;struct perf_time_interval *ptime_range;
tools/perf/builtin-stat.c +2 -2
@@ -165,7 +165,7 @@ struct perf_stat {struct perf_tool tool;bool maps_allocated;struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;enum aggr_mode aggr_mode; };
@@ -395,7 +395,7 @@ static bool perf_evsel__should_store_id(struct perf_evsel *counter) }static bool is_target_alive (struct target *_target, -struct thread_map *threads) +struct perf_thread_map *threads) {struct stat st;int i;
tools/perf/tests/code-reading.c +1 -1
@@ -552,7 +552,7 @@ static int do_test_code_reading(bool try_kcore)struct state state = { .done_cnt =0 , }; -struct thread_map *threads =NULL ; +struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;
tools/perf/tests/event-times.c +2 -2
@@ -57,7 +57,7 @@ static int detach__enable_on_exec(struct perf_evlist *evlist)static int attach__current_disabled (struct perf_evlist *evlist) {struct perf_evsel *evsel =perf_evlist__last (evlist); -struct thread_map *threads; +struct perf_thread_map *threads;int err;pr_debug ("attaching to current thread as disabled\n" );
@@ -83,7 +83,7 @@ static int attach__current_disabled(struct perf_evlist *evlist)static int attach__current_enabled (struct perf_evlist *evlist) {struct perf_evsel *evsel =perf_evlist__last (evlist); -struct thread_map *threads; +struct perf_thread_map *threads;int err;pr_debug ("attaching to current thread as enabled\n" );
tools/perf/tests/keep-tracking.c +1 -1
@@ -65,7 +65,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un .uses_mmap = true, }, }; -struct thread_map *threads =NULL ; +struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel =NULL ;
tools/perf/tests/mmap-basic.c +1 -1
@@ -27,7 +27,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse {int err =-1 ;union perf_event *event; -struct thread_map *threads; +struct perf_thread_map *threads;struct perf_cpu_map *cpus;struct perf_evlist *evlist;cpu_set_t cpu_set;
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -138,7 +138,7 @@ static int synth_all(struct machine *machine)static int synth_process (struct machine *machine) { -struct thread_map *map; +struct perf_thread_map *map;int err; map =thread_map__new_by_pid (getpid ());
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -24,7 +24,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, intstruct perf_evsel *evsel;unsigned int nr_openat_calls =111 , i;cpu_set_t cpu_set; -struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +struct perf_thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );char sbuf[STRERR_BUFSIZE ];char errbuf[BUFSIZ ];
tools/perf/tests/openat-syscall.c +1 -1
@@ -16,7 +16,7 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __mint err =-1 , fd;struct perf_evsel *evsel;unsigned int nr_openat_calls =111 , i; -struct thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX ); +struct perf_thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );char sbuf[STRERR_BUFSIZE ];char errbuf[BUFSIZ ];
tools/perf/tests/sw-clock.c +1 -1
@@ -38,7 +38,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) .freq = 1, };struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;struct perf_mmap *md; attr.sample_freq =500 ;
tools/perf/tests/switch-tracking.c +1 -1
@@ -327,7 +327,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ .uses_mmap = true, }, }; -struct thread_map *threads =NULL ; +struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ;struct perf_evsel *evsel, *cpu_clocks_evsel, *cycles_evsel;
tools/perf/tests/task-exit.c +1 -1
@@ -46,7 +46,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedconst char *argv[] = {"true" ,NULL };char sbuf[STRERR_BUFSIZE ];struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;struct perf_mmap *md;signal (SIGCHLD , sig_handler);
tools/perf/tests/thread-map.c +4 -4
@@ -13,7 +13,7 @@int test__thread_map (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct thread_map *map; +struct perf_thread_map *map;TEST_ASSERT_VAL ("failed to set process name" , !prctl (PR_SET_NAME ,NAMEUL ,0 ,0 ,0 ));
@@ -57,7 +57,7 @@ static int process_event(struct perf_tool *tool __maybe_unused, struct machine *machine __maybe_unused) {struct thread_map_event *map = &event->thread_map; -struct thread_map *threads; +struct perf_thread_map *threads;TEST_ASSERT_VAL ("wrong nr" , map->nr ==1 );TEST_ASSERT_VAL ("wrong pid" , map->entries[0 ].pid == (u64 )getpid ());
@@ -80,7 +80,7 @@ static int process_event(struct perf_tool *tool __maybe_unused,int test__thread_map_synthesize (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct thread_map *threads; +struct perf_thread_map *threads;TEST_ASSERT_VAL ("failed to set process name" , !prctl (PR_SET_NAME ,NAMEUL ,0 ,0 ,0 ));
@@ -99,7 +99,7 @@ int test__thread_map_synthesize(struct test *test __maybe_unused, int subtest __int test__thread_map_remove (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct thread_map *threads; +struct perf_thread_map *threads;char *str;int i;
tools/perf/util/event.c +3 -3
@@ -616,7 +616,7 @@ static int __event__synthesize_thread(union perf_event *comm_event, }int perf_event__synthesize_thread_map (struct perf_tool *tool, -struct thread_map *threads, +struct perf_thread_map *threads,perf_event__handler_t process,struct machine *machine,bool mmap_data)
@@ -972,7 +972,7 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool, }int perf_event__synthesize_thread_map2 (struct perf_tool *tool, -struct thread_map *threads, +struct perf_thread_map *threads,perf_event__handler_t process,struct machine *machine) {
@@ -1377,7 +1377,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp)size_t perf_event__fprintf_thread_map (union perf_event *event,FILE *fp) { -struct thread_map *threads =thread_map__new_event (&event->thread_map); +struct perf_thread_map *threads =thread_map__new_event (&event->thread_map);size_t ret; ret =fprintf (fp," nr: " );
tools/perf/util/event.h +3 -3
@@ -674,7 +674,7 @@ union perf_event {void perf_event__print_totals (void );struct perf_tool ; -struct thread_map ; +struct perf_thread_map ;struct perf_cpu_map ;struct perf_stat_config ;struct perf_counts_values ;
@@ -685,11 +685,11 @@ typedef int (*perf_event__handler_t)(struct perf_tool *tool, struct machine *machine);int perf_event__synthesize_thread_map (struct perf_tool *tool, -struct thread_map *threads, +struct perf_thread_map *threads,perf_event__handler_t process,struct machine *machine,bool mmap_data);int perf_event__synthesize_thread_map2 (struct perf_tool *tool, -struct thread_map *threads, +struct perf_thread_map *threads,perf_event__handler_t process,struct machine *machine); int perf_event__synthesize_cpu_map(struct perf_tool *tool,
tools/perf/util/evlist.c +5 -5
@@ -42,7 +42,7 @@ int sigqueue(pid_t pid, int sig, const union sigval value);#define SID (e, x, y) xyarray__entry(e->sample_id, x, y)void perf_evlist__init (struct perf_evlist *evlist,struct perf_cpu_map *cpus, -struct thread_map *threads) +struct perf_thread_map *threads) {int i;
@@ -1013,7 +1013,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, {struct perf_evsel *evsel;const struct perf_cpu_map *cpus = evlist->cpus; -const struct thread_map *threads = evlist->threads; +const struct perf_thread_map *threads = evlist->threads;/* * Delay setting mp.prot: set it before calling perf_mmap__mmap. * Its value is decided by evsel's write_backward.
@@ -1059,7 +1059,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) {bool all_threads = (target->per_thread && target->system_wide);struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;/* * If specify '-a' and '--per-thread' to perf record, perf record
@@ -1105,7 +1105,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) }void perf_evlist__set_maps (struct perf_evlist *evlist,struct perf_cpu_map *cpus, -struct thread_map *threads) +struct perf_thread_map *threads) {/* * Allow for the possibility that one or another of the maps isn't being
@@ -1359,7 +1359,7 @@ void perf_evlist__close(struct perf_evlist *evlist)static int perf_evlist__create_syswide_maps (struct perf_evlist *evlist) {struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;int err = -ENOMEM ;/*
tools/perf/util/evlist.h +3 -3
@@ -44,7 +44,7 @@ struct perf_evlist {struct fdarray pollfd;struct perf_mmap *mmap;struct perf_mmap *overwrite_mmap; -struct thread_map *threads; +struct perf_thread_map *threads;struct perf_cpu_map *cpus;struct perf_evsel *selected;struct events_stats stats;
@@ -69,7 +69,7 @@ struct perf_evlist *perf_evlist__new(void);struct perf_evlist *perf_evlist__new_default (void );struct perf_evlist *perf_evlist__new_dummy (void );void perf_evlist__init (struct perf_evlist *evlist,struct perf_cpu_map *cpus, -struct thread_map *threads); +struct perf_thread_map *threads);void perf_evlist__exit (struct perf_evlist *evlist);void perf_evlist__delete (struct perf_evlist *evlist);
@@ -195,7 +195,7 @@ void perf_evlist__set_selected(struct perf_evlist *evlist, struct perf_evsel *evsel);void perf_evlist__set_maps (struct perf_evlist *evlist,struct perf_cpu_map *cpus, -struct thread_map *threads); +struct perf_thread_map *threads);int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target);int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel);
tools/perf/util/evsel.c +5 -5
@@ -1743,7 +1743,7 @@ static int update_fds(struct perf_evsel *evsel,static bool ignore_missing_thread (struct perf_evsel *evsel,int nr_cpus,int cpu, -struct thread_map *threads, +struct perf_thread_map *threads,int thread,int err) {pid_t ignore_pid =thread_map__pid (threads, thread);
@@ -1826,7 +1826,7 @@ static int perf_event_open(struct perf_evsel *evsel, }int perf_evsel__open (struct perf_evsel *evsel,struct perf_cpu_map *cpus, -struct thread_map *threads) +struct perf_thread_map *threads) {int cpu, thread, nthreads;unsigned long flags =PERF_FLAG_FD_CLOEXEC ;
@@ -1849,7 +1849,7 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, }if (threads ==NULL ) { -static struct thread_map *empty_thread_map; +static struct perf_thread_map *empty_thread_map;if (empty_thread_map ==NULL ) { empty_thread_map =thread_map__new_by_tid (-1 );
@@ -2090,7 +2090,7 @@ int perf_evsel__open_per_cpu(struct perf_evsel *evsel, }int perf_evsel__open_per_thread (struct perf_evsel *evsel, -struct thread_map *threads) +struct perf_thread_map *threads) {return perf_evsel__open (evsel,NULL , threads); }
@@ -3065,7 +3065,7 @@ static int store_evsel_ids(struct perf_evsel *evsel, struct perf_evlist *evlist)int perf_evsel__store_ids (struct perf_evsel *evsel,struct perf_evlist *evlist) {struct perf_cpu_map *cpus = evsel->cpus; -struct thread_map *threads = evsel->threads; +struct perf_thread_map *threads = evsel->threads;if (perf_evsel__alloc_id (evsel, cpus->nr, threads->nr))return -ENOMEM ;
tools/perf/util/evsel.h +3 -3
@@ -126,7 +126,7 @@ struct perf_evsel {void *handler;struct perf_cpu_map *cpus;struct perf_cpu_map *own_cpus; -struct thread_map *threads; +struct perf_thread_map *threads;unsigned int sample_size;int id_pos;int is_pos;
@@ -302,9 +302,9 @@ int perf_evsel__disable(struct perf_evsel *evsel);int perf_evsel__open_per_cpu (struct perf_evsel *evsel,struct perf_cpu_map *cpus);int perf_evsel__open_per_thread (struct perf_evsel *evsel, -struct thread_map *threads); +struct perf_thread_map *threads);int perf_evsel__open (struct perf_evsel *evsel,struct perf_cpu_map *cpus, -struct thread_map *threads); +struct perf_thread_map *threads);void perf_evsel__close (struct perf_evsel *evsel);struct perf_sample ;
tools/perf/util/machine.c +1 -1
@@ -2599,7 +2599,7 @@ int machines__for_each_thread(struct machines *machines, }int __machine__synthesize_threads (struct machine *machine,struct perf_tool *tool, -struct target *target,struct thread_map *threads, +struct target *target,struct perf_thread_map *threads,perf_event__handler_t process,bool data_mmap,unsigned int nr_threads_synthesize) {
tools/perf/util/machine.h +2 -2
@@ -251,12 +251,12 @@ int machines__for_each_thread(struct machines *machines, void *priv);int __machine__synthesize_threads (struct machine *machine,struct perf_tool *tool, -struct target *target,struct thread_map *threads, +struct target *target,struct perf_thread_map *threads,perf_event__handler_t process,bool data_mmap,unsigned int nr_threads_synthesize);static inline int machine__synthesize_threads (struct machine *machine,struct target *target, -struct thread_map *threads,bool data_mmap, +struct perf_thread_map *threads,bool data_mmap,unsigned int nr_threads_synthesize) { return __machine__synthesize_threads(machine, NULL, target, threads,
tools/perf/util/parse-events.c +1 -1
@@ -2313,7 +2313,7 @@ static bool is_event_supported(u8 type, unsigned config) .config = config, .disabled = 1, }; -struct thread_map *tmap =thread_map__new_by_tid (0 ); +struct perf_thread_map *tmap =thread_map__new_by_tid (0 );if (tmap ==NULL )return false;
tools/perf/util/python.c +3 -3
@@ -605,7 +605,7 @@ static int pyrf_cpu_map__setup_types(void)struct pyrf_thread_map {PyObject_HEAD - struct thread_map *threads; + struct perf_thread_map *threads; }; static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,
@@ -797,7 +797,7 @@ static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel, {struct perf_evsel *evsel = &pevsel->evsel;struct perf_cpu_map *cpus =NULL ; -struct thread_map *threads =NULL ; +struct perf_thread_map *threads =NULL ;PyObject *pcpus =NULL , *pthreads =NULL ;int group =0 , inherit =0 ;static char *kwlist[] = {"cpus" ,"threads" ,"group" ,"inherit" ,NULL };
@@ -866,7 +866,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist, {PyObject *pcpus =NULL , *pthreads =NULL ;struct perf_cpu_map *cpus; -struct thread_map *threads; +struct perf_thread_map *threads;if (!PyArg_ParseTuple (args,"OO" , &pcpus, &pthreads))return -1 ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -1392,7 +1392,7 @@ process_stat(struct perf_evsel *counter, int cpu, int thread, u64 tstamp,static void python_process_stat (struct perf_stat_config *config,struct perf_evsel *counter,u64 tstamp) { -struct thread_map *threads = counter->threads; +struct perf_thread_map *threads = counter->threads;struct perf_cpu_map *cpus = counter->cpus;int cpu, thread;
tools/perf/util/thread_map.c +30 -30
204 lines not on this page · raw message
tools/perf/util/thread_map.h +20 -20
@@ -11,7 +11,7 @@ struct thread_map_data {char *comm; }; -struct thread_map { +struct perf_thread_map {refcount_t refcnt;int nr;int err_thread;
@@ -20,46 +20,46 @@ struct thread_map {struct thread_map_event ; -struct thread_map *thread_map__new_dummy (void ); -struct thread_map *thread_map__new_by_pid (pid_t pid); -struct thread_map *thread_map__new_by_tid (pid_t tid); -struct thread_map *thread_map__new_by_uid (uid_t uid); -struct thread_map *thread_map__new_all_cpus (void ); -struct thread_map *thread_map__new (pid_t pid,pid_t tid,uid_t uid); -struct thread_map *thread_map__new_event (struct thread_map_event *event); +struct perf_thread_map *thread_map__new_dummy (void ); +struct perf_thread_map *thread_map__new_by_pid (pid_t pid); +struct perf_thread_map *thread_map__new_by_tid (pid_t tid); +struct perf_thread_map *thread_map__new_by_uid (uid_t uid); +struct perf_thread_map *thread_map__new_all_cpus (void ); +struct perf_thread_map *thread_map__new (pid_t pid,pid_t tid,uid_t uid); +struct perf_thread_map *thread_map__new_event (struct thread_map_event *event); -struct thread_map *thread_map__get (struct thread_map *map); -void thread_map__put (struct thread_map *map); +struct perf_thread_map *thread_map__get (struct perf_thread_map *map); +void thread_map__put (struct perf_thread_map *map); -struct thread_map *thread_map__new_str (const char *pid, +struct perf_thread_map *thread_map__new_str (const char *pid,const char *tid,uid_t uid,bool all_threads); -struct thread_map *thread_map__new_by_tid_str (const char *tid_str); +struct perf_thread_map *thread_map__new_by_tid_str (const char *tid_str); -size_t thread_map__fprintf (struct thread_map *threads,FILE *fp); +size_t thread_map__fprintf (struct perf_thread_map *threads,FILE *fp); -static inline int thread_map__nr (struct thread_map *threads) +static inline int thread_map__nr (struct perf_thread_map *threads) {return threads ? threads->nr :1 ; } -static inline pid_t thread_map__pid (struct thread_map *map,int thread) +static inline pid_t thread_map__pid (struct perf_thread_map *map,int thread) {return map->map[thread].pid; }static inline void -thread_map__set_pid (struct thread_map *map,int thread,pid_t pid) +thread_map__set_pid (struct perf_thread_map *map,int thread,pid_t pid) { map->map[thread].pid = pid; } -static inline char *thread_map__comm (struct thread_map *map,int thread) +static inline char *thread_map__comm (struct perf_thread_map *map,int thread) {return map->map[thread].comm; } -void thread_map__read_comms (struct thread_map *threads); -bool thread_map__has (struct thread_map *threads,pid_t pid); -int thread_map__remove (struct thread_map *threads,int idx); +void thread_map__read_comms (struct perf_thread_map *threads); +bool thread_map__has (struct perf_thread_map *threads,pid_t pid); +int thread_map__remove (struct perf_thread_map *threads,int idx);#endif /* __PERF_THREAD_MAP_H */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 31/107 perf evsel: Rename struct perf_evsel to struct evsel
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename struct perf_evsel to struct evsel, so we don't have a name clash when we add struct perf_evsel in libperf.
Committer notes:
Added fixes for arm64, provided by Jiri.
--- tools/perf/arch/arm/util/auxtrace.c | 2 +- tools/perf/arch/arm/util/cs-etm.c | 20 +-- tools/perf/arch/arm64/util/arm-spe.c | 6 +- tools/perf/arch/powerpc/util/kvm-stat.c | 6 +- tools/perf/arch/s390/util/auxtrace.c | 2 +- tools/perf/arch/s390/util/kvm-stat.c | 8 +- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/auxtrace.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 10 +- tools/perf/arch/x86/util/intel-pt.c | 20 +-- tools/perf/arch/x86/util/kvm-stat.c | 12 +- tools/perf/builtin-annotate.c | 16 +- tools/perf/builtin-c2c.c | 4 +- tools/perf/builtin-diff.c | 12 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 30 ++-- tools/perf/builtin-kmem.c | 24 +-- tools/perf/builtin-kvm.c | 20 +-- tools/perf/builtin-lock.c | 30 ++-- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-report.c | 22 +-- tools/perf/builtin-sched.c | 74 ++++---- tools/perf/builtin-script.c | 90 +++++----- tools/perf/builtin-stat.c | 18 +- tools/perf/builtin-timechart.c | 44 ++--- tools/perf/builtin-top.c | 30 ++-- tools/perf/builtin-trace.c | 76 ++++---- tools/perf/tests/backward-ring-buffer.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 14 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 +- tools/perf/tests/evsel-tp-sched.c | 4 +- tools/perf/tests/hists_cumulate.c | 14 +- tools/perf/tests/hists_filter.c | 4 +- tools/perf/tests/hists_link.c | 4 +- tools/perf/tests/hists_output.c | 16 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/openat-syscall.c | 2 +- tools/perf/tests/parse-events.c | 120 ++++++------- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/sample-parsing.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 10 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/ui/browsers/annotate.c | 14 +- tools/perf/ui/browsers/hists.c | 40 ++--- tools/perf/ui/browsers/res_sample.c | 2 +- tools/perf/ui/browsers/scripts.c | 4 +- tools/perf/ui/gtk/annotate.c | 6 +- tools/perf/ui/gtk/gtk.h | 4 +- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/ui/hist.c | 8 +- tools/perf/util/annotate.c | 32 ++-- tools/perf/util/annotate.h | 26 +-- tools/perf/util/auxtrace.c | 8 +- tools/perf/util/bpf-loader.c | 12 +- tools/perf/util/bpf-loader.h | 6 +- tools/perf/util/build-id.c | 2 +- tools/perf/util/build-id.h | 2 +- tools/perf/util/callchain.c | 2 +- tools/perf/util/callchain.h | 2 +- tools/perf/util/cgroup.c | 10 +- tools/perf/util/counts.c | 6 +- tools/perf/util/counts.h | 6 +- tools/perf/util/cs-etm.c | 4 +- tools/perf/util/data-convert-bt.c | 18 +- tools/perf/util/db-export.c | 6 +- tools/perf/util/db-export.h | 10 +- tools/perf/util/evlist.c | 142 +++++++-------- tools/perf/util/evlist.h | 46 ++--- tools/perf/util/evsel.c | 168 +++++++++--------- tools/perf/util/evsel.h | 146 +++++++-------- tools/perf/util/evsel_fprintf.c | 4 +- tools/perf/util/header.c | 58 +++--- tools/perf/util/header.h | 8 +- tools/perf/util/hist.c | 26 +-- tools/perf/util/hist.h | 28 +-- tools/perf/util/intel-bts.c | 2 +- tools/perf/util/intel-pt.c | 36 ++-- tools/perf/util/jitdump.c | 4 +- tools/perf/util/kvm-stat.h | 18 +- tools/perf/util/machine.c | 6 +- tools/perf/util/machine.h | 4 +- tools/perf/util/map.h | 2 +- tools/perf/util/metricgroup.c | 22 +-- tools/perf/util/metricgroup.h | 6 +- tools/perf/util/parse-events.c | 48 ++--- tools/perf/util/parse-events.h | 2 +- tools/perf/util/python.c | 14 +- tools/perf/util/record.c | 16 +- tools/perf/util/s390-cpumsf.c | 2 +- tools/perf/util/s390-sample-raw.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 8 +- .../scripting-engines/trace-event-python.c | 22 +-- tools/perf/util/session.c | 30 ++-- tools/perf/util/session.h | 8 +- tools/perf/util/sort.c | 28 +-- tools/perf/util/stat-display.c | 60 +++---- tools/perf/util/stat-shadow.c | 38 ++-- tools/perf/util/stat.c | 38 ++-- tools/perf/util/stat.h | 14 +- tools/perf/util/tool.h | 4 +- tools/perf/util/top.c | 2 +- tools/perf/util/top.h | 4 +- tools/perf/util/trace-event-info.c | 4 +- tools/perf/util/trace-event-scripting.c | 2 +- tools/perf/util/trace-event.h | 4 +- 113 files changed, 1056 insertions(+), 1056 deletions(-)
tools/perf/arch/arm/util/auxtrace.c +1 -1
@@ -53,7 +53,7 @@ struct auxtrace_record *auxtrace_record__init(struct perf_evlist *evlist, int *err) {struct perf_pmu *cs_etm_pmu; -struct perf_evsel *evsel; +struct evsel *evsel;bool found_etm = false;bool found_spe = false;static struct perf_pmu **arm_spe_pmus =NULL ;
tools/perf/arch/arm/util/cs-etm.c +10 -10
@@ -55,7 +55,7 @@ static const char *metadata_etmv4_ro[CS_ETMV4_PRIV_MAX] = {static bool cs_etm_is_etmv4 (struct auxtrace_record *itr,int cpu);static int cs_etm_set_context_id (struct auxtrace_record *itr, -struct perf_evsel *evsel,int cpu) +struct evsel *evsel,int cpu) {struct cs_etm_recording *ptr;struct perf_pmu *cs_etm_pmu;
@@ -104,7 +104,7 @@ static int cs_etm_set_context_id(struct auxtrace_record *itr, }static int cs_etm_set_timestamp (struct auxtrace_record *itr, -struct perf_evsel *evsel,int cpu) +struct evsel *evsel,int cpu) {struct cs_etm_recording *ptr;struct perf_pmu *cs_etm_pmu;
@@ -152,7 +152,7 @@ static int cs_etm_set_timestamp(struct auxtrace_record *itr, }static int cs_etm_set_option (struct auxtrace_record *itr, -struct perf_evsel *evsel,u32 option) +struct evsel *evsel,u32 option) {int i, err = -EINVAL ;struct perf_cpu_map *event_cpus = evsel->evlist->cpus;
@@ -208,7 +208,7 @@ static int cs_etm_parse_snapshot_options(struct auxtrace_record *itr, }static int cs_etm_set_sink_attr (struct perf_pmu *pmu, -struct perf_evsel *evsel) +struct evsel *evsel) {char msg[BUFSIZ ], path[PATH_MAX ], *sink;struct perf_evsel_config_term *term;
@@ -252,7 +252,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr,struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu; -struct perf_evsel *evsel, *cs_etm_evsel =NULL ; +struct evsel *evsel, *cs_etm_evsel =NULL ;struct perf_cpu_map *cpus = evlist->cpus;bool privileged = (geteuid () ==0 ||perf_event_paranoid () <0 );int err =0 ;
@@ -407,7 +407,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr,/* Add dummy event to keep tracking */ if (opts->full_auxtrace) { -struct perf_evsel *tracking_evsel; +struct evsel *tracking_evsel; err =parse_events (evlist,"dummy:u" ,NULL );if (err)
@@ -435,7 +435,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr) container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;struct perf_evlist *evlist = ptr->evlist; -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {if (evsel->attr.type == cs_etm_pmu->type) {
@@ -817,7 +817,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr) {struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->cs_etm_pmu->type)
@@ -830,7 +830,7 @@ static int cs_etm_snapshot_finish(struct auxtrace_record *itr) {struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->cs_etm_pmu->type)
@@ -858,7 +858,7 @@ static int cs_etm_read_finish(struct auxtrace_record *itr, int idx) {struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->cs_etm_pmu->type)
tools/perf/arch/arm64/util/arm-spe.c +3 -3
@@ -65,9 +65,9 @@ static int arm_spe_recording_options(struct auxtrace_record *itr,struct arm_spe_recording *sper = container_of(itr, struct arm_spe_recording, itr);struct perf_pmu *arm_spe_pmu = sper->arm_spe_pmu; -struct perf_evsel *evsel, *arm_spe_evsel =NULL ; +struct evsel *evsel, *arm_spe_evsel =NULL ;bool privileged =geteuid () ==0 ||perf_event_paranoid () <0 ; -struct perf_evsel *tracking_evsel; +struct evsel *tracking_evsel;int err; sper->evlist = evlist;
@@ -160,7 +160,7 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) {struct arm_spe_recording *sper = container_of(itr, struct arm_spe_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (sper->evlist, evsel) {if (evsel->attr.type == sper->arm_spe_pmu->type)
tools/perf/arch/powerpc/util/kvm-stat.c +3 -3
@@ -32,7 +32,7 @@ const char *ppc_book3s_hv_kvm_tp[] = {const char *kvm_events_tp[NR_TPS +1 ];const char *kvm_exit_reason; -static void hcall_event_get_key (struct perf_evsel *evsel, +static void hcall_event_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -55,14 +55,14 @@ static const char *get_hcall_exit_reason(u64 exit_code)return "UNKNOWN" ; } -static bool hcall_event_end (struct perf_evsel *evsel, +static bool hcall_event_end (struct evsel *evsel,struct perf_sample *sample__maybe_unused ,struct event_key *key__maybe_unused ) {return (!strcmp (evsel->name, kvm_events_tp[3 ])); } -static bool hcall_event_begin (struct perf_evsel *evsel, +static bool hcall_event_begin (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {if (!strcmp (evsel->name, kvm_events_tp[2 ])) {
tools/perf/arch/s390/util/auxtrace.c +1 -1
@@ -86,7 +86,7 @@ struct auxtrace_record *auxtrace_record__init(struct perf_evlist *evlist, int *err) {struct auxtrace_record *aux; -struct perf_evsel *pos; +struct evsel *pos;int diagnose =0 ; *err =0 ;
tools/perf/arch/s390/util/kvm-stat.c +4 -4
@@ -23,7 +23,7 @@ const char *kvm_exit_reason = "icptcode";const char *kvm_entry_trace ="kvm:kvm_s390_sie_enter" ;const char *kvm_exit_trace ="kvm:kvm_s390_sie_exit" ; -static void event_icpt_insn_get_key (struct perf_evsel *evsel, +static void event_icpt_insn_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -34,7 +34,7 @@ static void event_icpt_insn_get_key(struct perf_evsel *evsel, key->exit_reasons = sie_icpt_insn_codes; } -static void event_sigp_get_key (struct perf_evsel *evsel, +static void event_sigp_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -42,7 +42,7 @@ static void event_sigp_get_key(struct perf_evsel *evsel, key->exit_reasons = sie_sigp_order_codes; } -static void event_diag_get_key (struct perf_evsel *evsel, +static void event_diag_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -50,7 +50,7 @@ static void event_diag_get_key(struct perf_evsel *evsel, key->exit_reasons = sie_diagnose_codes; } -static void event_icpt_prog_get_key (struct perf_evsel *evsel, +static void event_icpt_prog_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
tools/perf/arch/x86/tests/intel-cqm.c +1 -1
@@ -41,7 +41,7 @@ static pid_t spawn(void)int test__intel_cqm_count_nmi_context (struct test *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_evlist *evlist =NULL ; -struct perf_evsel *evsel =NULL ; +struct evsel *evsel =NULL ;struct perf_event_attr pe;int i, fd[2 ], flag, ret;size_t mmap_len;
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -52,7 +52,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybestruct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ; -struct perf_evsel *evsel =NULL ; +struct evsel *evsel =NULL ;int err =-1 , ret, i;const char *comm1, *comm2;struct perf_tsc_conversion tc;
tools/perf/arch/x86/util/auxtrace.c +1 -1
@@ -21,7 +21,7 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, {struct perf_pmu *intel_pt_pmu;struct perf_pmu *intel_bts_pmu; -struct perf_evsel *evsel; +struct evsel *evsel;bool found_pt = false;bool found_bts = false;
tools/perf/arch/x86/util/intel-bts.c +5 -5
@@ -105,7 +105,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,struct intel_bts_recording *btsr = container_of(itr, struct intel_bts_recording, itr);struct perf_pmu *intel_bts_pmu = btsr->intel_bts_pmu; -struct perf_evsel *evsel, *intel_bts_evsel =NULL ; +struct evsel *evsel, *intel_bts_evsel =NULL ;const struct perf_cpu_map *cpus = evlist->cpus;bool privileged =geteuid () ==0 ||perf_event_paranoid () <0 ;
@@ -220,7 +220,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,/* Add dummy event to keep tracking */ if (opts->full_auxtrace) { -struct perf_evsel *tracking_evsel; +struct evsel *tracking_evsel;int err; err =parse_events (evlist,"dummy:u" ,NULL );
@@ -313,7 +313,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr) {struct intel_bts_recording *btsr = container_of(itr, struct intel_bts_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) {if (evsel->attr.type == btsr->intel_bts_pmu->type)
@@ -326,7 +326,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr) {struct intel_bts_recording *btsr = container_of(itr, struct intel_bts_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) {if (evsel->attr.type == btsr->intel_bts_pmu->type)
@@ -408,7 +408,7 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx) {struct intel_bts_recording *btsr = container_of(itr, struct intel_bts_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) {if (evsel->attr.type == btsr->intel_bts_pmu->type)
tools/perf/arch/x86/util/intel-pt.c +10 -10
@@ -112,7 +112,7 @@ static u64 intel_pt_masked_bits(u64 mask, u64 bits)static int intel_pt_read_config (struct perf_pmu *intel_pt_pmu,const char *str,struct perf_evlist *evlist,u64 *res) { -struct perf_evsel *evsel; +struct evsel *evsel;u64 mask; *res =0 ;
@@ -271,7 +271,7 @@ intel_pt_pmu_default_config(struct perf_pmu *intel_pt_pmu)static const char *intel_pt_find_filter (struct perf_evlist *evlist,struct perf_pmu *intel_pt_pmu) { -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {if (evsel->attr.type == intel_pt_pmu->type)
@@ -401,7 +401,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,static int intel_pt_track_switches (struct perf_evlist *evlist) {const char *sched_switch ="sched:sched_switch" ; -struct perf_evsel *evsel; +struct evsel *evsel;int err;if (!perf_evlist__can_select_event (evlist, sched_switch))
@@ -513,7 +513,7 @@ static int intel_pt_val_config_term(struct perf_pmu *intel_pt_pmu, }static int intel_pt_validate_config (struct perf_pmu *intel_pt_pmu, -struct perf_evsel *evsel) +struct evsel *evsel) {int err;char c;
@@ -556,7 +556,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, container_of(itr, struct intel_pt_recording, itr);struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;bool have_timing_info, need_immediate = false; -struct perf_evsel *evsel, *intel_pt_evsel =NULL ; +struct evsel *evsel, *intel_pt_evsel =NULL ;const struct perf_cpu_map *cpus = evlist->cpus;bool privileged =geteuid () ==0 ||perf_event_paranoid () <0 ;u64 tsc_bit;
@@ -685,7 +685,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, !target__has_task (&opts->target);if (!cpu_wide &&perf_can_record_cpu_wide ()) { -struct perf_evsel *switch_evsel; +struct evsel *switch_evsel; err =parse_events (evlist,"dummy:u" ,NULL );if (err)
@@ -743,7 +743,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,/* Add dummy event to keep tracking */ if (opts->full_auxtrace) { -struct perf_evsel *tracking_evsel; +struct evsel *tracking_evsel; err =parse_events (evlist,"dummy:u" ,NULL );if (err)
@@ -784,7 +784,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr) {struct intel_pt_recording *ptr = container_of(itr, struct intel_pt_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->intel_pt_pmu->type)
@@ -797,7 +797,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr) {struct intel_pt_recording *ptr = container_of(itr, struct intel_pt_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->intel_pt_pmu->type)
@@ -1070,7 +1070,7 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx) {struct intel_pt_recording *ptr = container_of(itr, struct intel_pt_recording, itr); -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->intel_pt_pmu->type)
tools/perf/arch/x86/util/kvm-stat.c +6 -6
@@ -27,7 +27,7 @@ const char *kvm_exit_trace = "kvm:kvm_exit";* the time of MMIO write: kvm_mmio(KVM_TRACE_MMIO_WRITE...) -> kvm_entry * the time of MMIO read: kvm_exit -> kvm_mmio(KVM_TRACE_MMIO_READ...). */ -static void mmio_event_get_key (struct perf_evsel *evsel,struct perf_sample *sample, +static void mmio_event_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) { key->key =perf_evsel__intval (evsel, sample,"gpa" );
@@ -38,7 +38,7 @@ static void mmio_event_get_key(struct perf_evsel *evsel, struct perf_sample *sam#define KVM_TRACE_MMIO_READ 1#define KVM_TRACE_MMIO_WRITE 2 -static bool mmio_event_begin (struct perf_evsel *evsel, +static bool mmio_event_begin (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {/* MMIO read begin event in kernel. */
@@ -55,7 +55,7 @@ static bool mmio_event_begin(struct perf_evsel *evsel,return false; } -static bool mmio_event_end (struct perf_evsel *evsel,struct perf_sample *sample, +static bool mmio_event_end (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {/* MMIO write end event in kernel. */
@@ -89,7 +89,7 @@ static struct kvm_events_ops mmio_events = { };/* The time of emulation pio access is from kvm_pio to kvm_entry. */ -static void ioport_event_get_key (struct perf_evsel *evsel, +static void ioport_event_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -97,7 +97,7 @@ static void ioport_event_get_key(struct perf_evsel *evsel, key->info =perf_evsel__intval (evsel, sample,"rw" ); } -static bool ioport_event_begin (struct perf_evsel *evsel, +static bool ioport_event_begin (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -109,7 +109,7 @@ static bool ioport_event_begin(struct perf_evsel *evsel,return false; } -static bool ioport_event_end (struct perf_evsel *evsel, +static bool ioport_event_end (struct evsel *evsel,struct perf_sample *sample__maybe_unused ,struct event_key *key__maybe_unused ) {
tools/perf/builtin-annotate.c +8 -8
@@ -156,7 +156,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,struct hist_entry *he = iter->he;struct branch_info *bi;struct perf_sample *sample = iter->sample; -struct perf_evsel *evsel = iter->evsel; +struct evsel *evsel = iter->evsel;int err; bi = he->branch_info;
@@ -171,7 +171,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,return err; } -static int process_branch_callback(struct perf_evsel *evsel, +static int process_branch_callback(struct evsel *evsel, struct perf_sample *sample, struct addr_location *al __maybe_unused, struct perf_annotate *ann,
@@ -208,7 +208,7 @@ static bool has_annotation(struct perf_annotate *ann)return ui__has_annotation () || ann->use_stdio2; } -static int perf_evsel__add_sample(struct perf_evsel *evsel, +static int perf_evsel__add_sample(struct evsel *evsel, struct perf_sample *sample, struct addr_location *al, struct perf_annotate *ann,
@@ -257,7 +257,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,static int process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) { struct perf_annotate *ann = container_of(tool, struct perf_annotate, tool);
@@ -293,7 +293,7 @@ static int process_feature_event(struct perf_session *session, }static int hist_entry__tty_annotate (struct hist_entry *he, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_annotate *ann) {if (!ann->use_stdio2)
@@ -303,7 +303,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he, }static void hists__find_annotations (struct hists *hists, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_annotate *ann) {struct rb_node *nd =rb_first_cached (&hists->entries), *next;
@@ -333,7 +333,7 @@ static void hists__find_annotations(struct hists *hists,if (use_browser ==2 ) {int ret;int (*annotate)(struct hist_entry *he, -struct perf_evsel *evsel, +struct evsel *evsel,struct hist_browser_timer *hbt); annotate = dlsym(perf_gtk_handle,
@@ -387,7 +387,7 @@ static int __cmd_annotate(struct perf_annotate *ann) {int ret;struct perf_session *session = ann->session; -struct perf_evsel *pos; +struct evsel *pos;u64 total_nr_samples;if (ann->cpu_list) {
tools/perf/builtin-c2c.c +2 -2
@@ -248,7 +248,7 @@ static void compute_stats(struct c2c_hist_entry *c2c_he,static int process_sample_event (struct perf_tool *tool__maybe_unused ,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {struct c2c_hists *c2c_hists = &c2c.hists;
@@ -2237,7 +2237,7 @@ static void print_pareto(FILE *out)static void print_c2c_info (FILE *out,struct perf_session *session) {struct perf_evlist *evlist = session->evlist; -struct perf_evsel *evsel; +struct evsel *evsel;bool first = true;fprintf (out,"=================================================\n" );
tools/perf/builtin-diff.c +6 -6
@@ -376,7 +376,7 @@ struct hist_entry_ops block_hist_ops = {static int diff__process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) { struct perf_diff *pdiff = container_of(tool, struct perf_diff, tool);
@@ -448,10 +448,10 @@ static struct perf_diff pdiff = { }, }; -static struct perf_evsel *evsel_match (struct perf_evsel *evsel, +static struct evsel *evsel_match (struct evsel *evsel,struct perf_evlist *evlist) { -struct perf_evsel *e; +struct evsel *e;evlist__for_each_entry (evlist, e) {if (perf_evsel__match2 (evsel, e))
@@ -463,7 +463,7 @@ static struct perf_evsel *evsel_match(struct perf_evsel *evsel,static void perf_evlist__collapse_resort (struct perf_evlist *evlist) { -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {struct hists *hists =evsel__hists (evsel);
@@ -1010,7 +1010,7 @@ static void data__fprintf(void)static void data_process (void ) {struct perf_evlist *evlist_base = data__files[0 ].session->evlist; -struct perf_evsel *evsel_base; +struct evsel *evsel_base;bool first = true;evlist__for_each_entry (evlist_base, evsel_base) {
@@ -1020,7 +1020,7 @@ static void data_process(void)data__for_each_file_new (i, d) {struct perf_evlist *evlist = d->session->evlist; -struct perf_evsel *evsel; +struct evsel *evsel;struct hists *hists; evsel =evsel_match (evsel_base, evlist);
tools/perf/builtin-evlist.c +1 -1
@@ -21,7 +21,7 @@static int __cmd_evlist (const char *file_name,struct perf_attr_details *details) {struct perf_session *session; -struct perf_evsel *pos; +struct evsel *pos;struct perf_data data = { .path = file_name, .mode =PERF_DATA_MODE_READ ,
tools/perf/builtin-inject.c +15 -15
@@ -215,13 +215,13 @@ static int perf_event__drop_aux(struct perf_tool *tool,typedef int (*inject_handler )(struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine);static int perf_event__repipe_sample (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {if (evsel && evsel->handler) {
@@ -424,7 +424,7 @@ static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool,static int perf_event__inject_buildid (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel__maybe_unused , +struct evsel *evsel__maybe_unused ,struct machine *machine) {struct addr_location al;
@@ -465,7 +465,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,static int perf_inject__sched_process_exit (struct perf_tool *tool,union perf_event *event__maybe_unused ,struct perf_sample *sample, -struct perf_evsel *evsel__maybe_unused , +struct evsel *evsel__maybe_unused ,struct machine *machine__maybe_unused ) { struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
@@ -485,7 +485,7 @@ static int perf_inject__sched_process_exit(struct perf_tool *tool,static int perf_inject__sched_switch (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) { struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
@@ -509,7 +509,7 @@ static int perf_inject__sched_switch(struct perf_tool *tool,static int perf_inject__sched_stat (struct perf_tool *tool,union perf_event *event__maybe_unused ,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {struct event_entry *ent;
@@ -541,7 +541,7 @@ static void sig_handler(int sig __maybe_unused) session_done =1 ; } -static int perf_evsel__check_stype (struct perf_evsel *evsel, +static int perf_evsel__check_stype (struct evsel *evsel,u64 sample_type,const char *sample_msg) {struct perf_event_attr *attr = &evsel->attr;
@@ -559,7 +559,7 @@ static int perf_evsel__check_stype(struct perf_evsel *evsel,static int drop_sample (struct perf_tool *tool__maybe_unused ,union perf_event *event__maybe_unused ,struct perf_sample *sample__maybe_unused , -struct perf_evsel *evsel__maybe_unused , +struct evsel *evsel__maybe_unused ,struct machine *machine__maybe_unused ) {return 0 ;
@@ -568,7 +568,7 @@ static int drop_sample(struct perf_tool *tool __maybe_unused,static void strip_init (struct perf_inject *inject) {struct perf_evlist *evlist = inject->session->evlist; -struct perf_evsel *evsel; +struct evsel *evsel; inject->tool.context_switch = perf_event__drop;
@@ -576,7 +576,7 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct perf_evsel *evsel) +static bool has_tracking (struct evsel *evsel) {return evsel->attr.mmap || evsel->attr.mmap2 || evsel->attr.comm || evsel->attr.task;
@@ -591,9 +591,9 @@ static bool has_tracking(struct perf_evsel *evsel)* and it has a compatible sample type. */ static bool ok_to_remove (struct perf_evlist *evlist, -struct perf_evsel *evsel_to_remove) +struct evsel *evsel_to_remove) { -struct perf_evsel *evsel; +struct evsel *evsel;int cnt =0 ;bool ok = false;
@@ -615,7 +615,7 @@ static bool ok_to_remove(struct perf_evlist *evlist,static void strip_fini (struct perf_inject *inject) {struct perf_evlist *evlist = inject->session->evlist; -struct perf_evsel *evsel, *tmp; +struct evsel *evsel, *tmp;/* Remove non-synthesized evsels if possible */ evlist__for_each_entry_safe (evlist, tmp, evsel) {
@@ -651,7 +651,7 @@ static int __cmd_inject(struct perf_inject *inject)if (inject->build_ids) { inject->tool.sample = perf_event__inject_buildid; }else if (inject->sched_stat) { -struct perf_evsel *evsel; +struct evsel *evsel;evlist__for_each_entry (session->evlist, evsel) {const char *name =perf_evsel__name (evsel);
@@ -712,7 +712,7 @@ static int __cmd_inject(struct perf_inject *inject)* remove the evsel. */ if (inject->itrace_synth_opts.set) { -struct perf_evsel *evsel; +struct evsel *evsel;perf_header__clear_feat (&session->header,HEADER_AUXTRACE );
tools/perf/builtin-kmem.c +12 -12
@@ -166,7 +166,7 @@ static int insert_caller_stat(unsigned long call_site,return 0 ; } -static int perf_evsel__process_alloc_event (struct perf_evsel *evsel, +static int perf_evsel__process_alloc_event (struct evsel *evsel,struct perf_sample *sample) { unsigned long ptr = perf_evsel__intval(evsel, sample, "ptr"),
@@ -185,7 +185,7 @@ static int perf_evsel__process_alloc_event(struct perf_evsel *evsel,return 0 ; } -static int perf_evsel__process_alloc_node_event (struct perf_evsel *evsel, +static int perf_evsel__process_alloc_node_event (struct evsel *evsel,struct perf_sample *sample) {int ret =perf_evsel__process_alloc_event (evsel, sample);
@@ -229,7 +229,7 @@ static struct alloc_stat *search_alloc_stat(unsigned long ptr,return NULL ; } -static int perf_evsel__process_free_event (struct perf_evsel *evsel, +static int perf_evsel__process_free_event (struct evsel *evsel,struct perf_sample *sample) {unsigned long ptr =perf_evsel__intval (evsel, sample,"ptr" );
@@ -381,7 +381,7 @@ static int build_alloc_func_list(void)* Find first non-memory allocation function from callchain. * The allocation functions are in the 'alloc_func_list'. */ -static u64 find_callsite (struct perf_evsel *evsel,struct perf_sample *sample) +static u64 find_callsite (struct evsel *evsel,struct perf_sample *sample) {struct addr_location al;struct machine *machine = &kmem_session->machines.host;
@@ -728,7 +728,7 @@ static char *compact_gfp_string(unsigned long gfp_flags)return NULL ; } -static int parse_gfp_flags (struct perf_evsel *evsel,struct perf_sample *sample, +static int parse_gfp_flags (struct evsel *evsel,struct perf_sample *sample,unsigned int gfp_flags) {struct tep_record record = {
@@ -779,7 +779,7 @@ static int parse_gfp_flags(struct perf_evsel *evsel, struct perf_sample *sample,return 0 ; } -static int perf_evsel__process_page_alloc_event (struct perf_evsel *evsel, +static int perf_evsel__process_page_alloc_event (struct evsel *evsel,struct perf_sample *sample) {u64 page;
@@ -852,7 +852,7 @@ static int perf_evsel__process_page_alloc_event(struct perf_evsel *evsel,return 0 ; } -static int perf_evsel__process_page_free_event (struct perf_evsel *evsel, +static int perf_evsel__process_page_free_event (struct evsel *evsel,struct perf_sample *sample) {u64 page;
@@ -930,13 +930,13 @@ static bool perf_kmem__skip_sample(struct perf_sample *sample)return false; } -typedef int (*tracepoint_handler )(struct perf_evsel *evsel, +typedef int (*tracepoint_handler )(struct evsel *evsel,struct perf_sample *sample);static int process_sample_event (struct perf_tool *tool__maybe_unused ,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {int err =0 ;
@@ -1363,8 +1363,8 @@ static void sort_result(void)static int __cmd_kmem (struct perf_session *session) {int err = -EINVAL ; -struct perf_evsel *evsel; -const struct perf_evsel_str_handler kmem_tracepoints[] = { +struct evsel *evsel; +const struct evsel_str_handler kmem_tracepoints[] = {/* slab allocator */ {"kmem:kmalloc" , perf_evsel__process_alloc_event, }, {"kmem:kmem_cache_alloc" , perf_evsel__process_alloc_event, },
@@ -1967,7 +1967,7 @@ int cmd_kmem(int argc, const char **argv) }if (kmem_page) { -struct perf_evsel *evsel; +struct evsel *evsel; evsel =perf_evlist__find_tracepoint_by_name (session->evlist,"kmem:mm_page_alloc" );
tools/perf/builtin-kvm.c +10 -10
@@ -57,7 +57,7 @@ static const char *get_filename_for_perf_kvm(void)#ifdef HAVE_KVM_STAT_SUPPORT #include "util/kvm-stat.h" -void exit_event_get_key (struct perf_evsel *evsel, +void exit_event_get_key (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -65,12 +65,12 @@ void exit_event_get_key(struct perf_evsel *evsel, key->key =perf_evsel__intval (evsel, sample, kvm_exit_reason); } -bool kvm_exit_event (struct perf_evsel *evsel) +bool kvm_exit_event (struct evsel *evsel) {return !strcmp (evsel->name, kvm_exit_trace); } -bool exit_event_begin (struct perf_evsel *evsel, +bool exit_event_begin (struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {if (kvm_exit_event (evsel)) {
@@ -81,12 +81,12 @@ bool exit_event_begin(struct perf_evsel *evsel,return false; } -bool kvm_entry_event (struct perf_evsel *evsel) +bool kvm_entry_event (struct evsel *evsel) {return !strcmp (evsel->name, kvm_entry_trace); } -bool exit_event_end (struct perf_evsel *evsel, +bool exit_event_end (struct evsel *evsel,struct perf_sample *sample__maybe_unused ,struct event_key *key__maybe_unused ) {
@@ -286,7 +286,7 @@ static bool update_kvm_event(struct kvm_event *event, int vcpu_id, }static bool is_child_event (struct perf_kvm_stat *kvm, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_sample *sample,struct event_key *key) {
@@ -396,7 +396,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm,static struct vcpu_event_record *per_vcpu_record (struct thread *thread, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_sample *sample) {/* Only kvm_entry records vcpu id. */
@@ -419,7 +419,7 @@ struct vcpu_event_record *per_vcpu_record(struct thread *thread,static bool handle_kvm_event (struct perf_kvm_stat *kvm,struct thread *thread, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_sample *sample) {struct vcpu_event_record *vcpu_record;
@@ -672,7 +672,7 @@ static bool skip_sample(struct perf_kvm_stat *kvm,static int process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {int err =0 ;
@@ -1011,7 +1011,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)static int kvm_live_open_events (struct perf_kvm_stat *kvm) {int err, rc =-1 ; -struct perf_evsel *pos; +struct evsel *pos;struct perf_evlist *evlist = kvm->evlist;char sbuf[STRERR_BUFSIZE ];
tools/perf/builtin-lock.c +15 -15
@@ -347,16 +347,16 @@ static struct lock_stat *lock_stat_findnew(void *addr, const char *name) }struct trace_lock_handler { -int (*acquire_event)(struct perf_evsel *evsel, +int (*acquire_event)(struct evsel *evsel,struct perf_sample *sample); -int (*acquired_event)(struct perf_evsel *evsel, +int (*acquired_event)(struct evsel *evsel,struct perf_sample *sample); -int (*contended_event)(struct perf_evsel *evsel, +int (*contended_event)(struct evsel *evsel,struct perf_sample *sample); -int (*release_event)(struct perf_evsel *evsel, +int (*release_event)(struct evsel *evsel,struct perf_sample *sample); };
@@ -396,7 +396,7 @@ enum acquire_flags { READ_LOCK = 2, }; -static int report_lock_acquire_event (struct perf_evsel *evsel, +static int report_lock_acquire_event (struct evsel *evsel,struct perf_sample *sample) {void *addr;
@@ -468,7 +468,7 @@ static int report_lock_acquire_event(struct perf_evsel *evsel,return 0 ; } -static int report_lock_acquired_event (struct perf_evsel *evsel, +static int report_lock_acquired_event (struct evsel *evsel,struct perf_sample *sample) {void *addr;
@@ -531,7 +531,7 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,return 0 ; } -static int report_lock_contended_event (struct perf_evsel *evsel, +static int report_lock_contended_event (struct evsel *evsel,struct perf_sample *sample) {void *addr;
@@ -586,7 +586,7 @@ static int report_lock_contended_event(struct perf_evsel *evsel,return 0 ; } -static int report_lock_release_event (struct perf_evsel *evsel, +static int report_lock_release_event (struct evsel *evsel,struct perf_sample *sample) {void *addr;
@@ -656,7 +656,7 @@ static struct trace_lock_handler report_lock_ops = {static struct trace_lock_handler *trace_handler; -static int perf_evsel__process_lock_acquire (struct perf_evsel *evsel, +static int perf_evsel__process_lock_acquire (struct evsel *evsel,struct perf_sample *sample) {if (trace_handler->acquire_event)
@@ -664,7 +664,7 @@ static int perf_evsel__process_lock_acquire(struct perf_evsel *evsel,return 0 ; } -static int perf_evsel__process_lock_acquired (struct perf_evsel *evsel, +static int perf_evsel__process_lock_acquired (struct evsel *evsel,struct perf_sample *sample) {if (trace_handler->acquired_event)
@@ -672,7 +672,7 @@ static int perf_evsel__process_lock_acquired(struct perf_evsel *evsel,return 0 ; } -static int perf_evsel__process_lock_contended (struct perf_evsel *evsel, +static int perf_evsel__process_lock_contended (struct evsel *evsel,struct perf_sample *sample) {if (trace_handler->contended_event)
@@ -680,7 +680,7 @@ static int perf_evsel__process_lock_contended(struct perf_evsel *evsel,return 0 ; } -static int perf_evsel__process_lock_release (struct perf_evsel *evsel, +static int perf_evsel__process_lock_release (struct evsel *evsel,struct perf_sample *sample) {if (trace_handler->release_event)
@@ -806,13 +806,13 @@ static int dump_info(void)return rc; } -typedef int (*tracepoint_handler )(struct perf_evsel *evsel, +typedef int (*tracepoint_handler )(struct evsel *evsel,struct perf_sample *sample);static int process_sample_event (struct perf_tool *tool__maybe_unused ,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) {int err =0 ;
@@ -847,7 +847,7 @@ static void sort_result(void) } } -static const struct perf_evsel_str_handler lock_tracepoints[] = { +static const struct evsel_str_handler lock_tracepoints[] = { {"lock:lock_acquire" , perf_evsel__process_lock_acquire, },/* CONFIG_LOCKDEP */ {"lock:lock_acquired" , perf_evsel__process_lock_acquired, },/* CONFIG_LOCKDEP, CONFIG_LOCK_STAT */ {"lock:lock_contended" , perf_evsel__process_lock_contended, },/* CONFIG_LOCKDEP, CONFIG_LOCK_STAT */
tools/perf/builtin-mem.c +1 -1
@@ -230,7 +230,7 @@ dump_raw_samples(struct perf_tool *tool,static int process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel__maybe_unused , +struct evsel *evsel__maybe_unused ,struct machine *machine) {return dump_raw_samples (tool, event, sample, machine);
tools/perf/builtin-record.c +2 -2
@@ -713,7 +713,7 @@ static int record__mmap(struct record *rec)static int record__open (struct record *rec) {char msg[BUFSIZ ]; -struct perf_evsel *pos; +struct evsel *pos;struct perf_evlist *evlist = rec->evlist;struct perf_session *session = rec->session;struct record_opts *opts = &rec->opts;
@@ -782,7 +782,7 @@ static int record__open(struct record *rec)static int process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) { struct record *rec = container_of(tool, struct record, tool);
tools/perf/builtin-report.c +11 -11
@@ -128,7 +128,7 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter,int err =0 ;struct report *rep = arg;struct hist_entry *he = iter->he; -struct perf_evsel *evsel = iter->evsel; +struct evsel *evsel = iter->evsel;struct perf_sample *sample = iter->sample;struct mem_info *mi;struct branch_info *bi;
@@ -172,7 +172,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,struct report *rep = arg;struct branch_info *bi;struct perf_sample *sample = iter->sample; -struct perf_evsel *evsel = iter->evsel; +struct evsel *evsel = iter->evsel;int err;if (!ui__has_annotation () && !rep->symbol_ipc)
@@ -225,7 +225,7 @@ static int process_feature_event(struct perf_session *session,static int process_sample_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine) { struct report *rep = container_of(tool, struct report, tool);
@@ -292,7 +292,7 @@ static int process_sample_event(struct perf_tool *tool,static int process_read_event (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample__maybe_unused , -struct perf_evsel *evsel, +struct evsel *evsel,struct machine *machine__maybe_unused ) { struct report *rep = container_of(tool, struct report, tool);
@@ -400,7 +400,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportchar unit;unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE ];u64 nr_events = hists->stats.total_period; -struct perf_evsel *evsel =hists_to_evsel (hists); +struct evsel *evsel =hists_to_evsel (hists);char buf[512 ];size_t size =sizeof (buf);int socked_id = hists->socket_filter;
@@ -414,7 +414,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report }if (perf_evsel__is_group_event (evsel)) { -struct perf_evsel *pos; +struct evsel *pos;perf_evsel__group_desc (evsel, buf, size); evname = buf;
@@ -463,7 +463,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,struct report *rep, const char *help) { - struct perf_evsel *pos; + struct evsel *pos;if (!quiet) { fprintf(stdout, "#\n# Total Lost Samples: %" PRIu64 "\n#\n",
@@ -586,7 +586,7 @@ static int report__browse_hists(struct report *rep)static int report__collapse_hists (struct report *rep) {struct ui_progress prog; -struct perf_evsel *pos; +struct evsel *pos;int ret =0 ;ui_progress__init (&prog, rep->nr_entries,"Merging related events..." );
@@ -623,7 +623,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg)struct symbol *sym = he->ms.sym;if (rep->symbol_ipc && sym && !sym->annotate2) { -struct perf_evsel *evsel =hists_to_evsel (he->hists); +struct evsel *evsel =hists_to_evsel (he->hists);symbol__annotate2 (sym, he->ms.map, evsel, &annotation__default_options,NULL );
@@ -635,7 +635,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg)static void report__output_resort (struct report *rep) {struct ui_progress prog; -struct perf_evsel *pos; +struct evsel *pos;ui_progress__init (&prog, rep->nr_entries,"Sorting events for output..." );
@@ -818,7 +818,7 @@ static int __cmd_report(struct report *rep) {int ret;struct perf_session *session = rep->session; -struct perf_evsel *pos; +struct evsel *pos;struct perf_data *data = session->data;signal (SIGINT , sig_handler);
tools/perf/builtin-sched.c +37 -37
286 lines not on this page · raw message
tools/perf/builtin-script.c +45 -45
332 lines not on this page · raw message
tools/perf/builtin-stat.c +9 -9
@@ -234,7 +234,7 @@ static int write_stat_round_event(u64 tm, u64 type)#define SID (e, x, y) xyarray__entry(e->sample_id, x, y)static int -perf_evsel__write_stat_event (struct perf_evsel *counter,u32 cpu,u32 thread, +perf_evsel__write_stat_event (struct evsel *counter,u32 cpu,u32 thread,struct perf_counts_values *count) {struct perf_sample_id *sid =SID (counter, cpu, thread);
@@ -243,7 +243,7 @@ perf_evsel__write_stat_event(struct perf_evsel *counter, u32 cpu, u32 thread, process_synthesized_event, NULL); } -static int read_single_counter (struct perf_evsel *counter,int cpu, +static int read_single_counter (struct evsel *counter,int cpu,int thread,struct timespec *rs) {if (counter->tool_event ==PERF_TOOL_DURATION_TIME ) {
@@ -261,7 +261,7 @@ static int read_single_counter(struct perf_evsel *counter, int cpu,* Read out the results of a single counter: * do not aggregate counts across CPUs in system-wide mode */ -static int read_counter (struct perf_evsel *counter,struct timespec *rs) +static int read_counter (struct evsel *counter,struct timespec *rs) {int nthreads =thread_map__nr (evsel_list->threads);int ncpus, cpu, thread;
@@ -319,7 +319,7 @@ static int read_counter(struct perf_evsel *counter, struct timespec *rs)static void read_counters (struct timespec *rs) { -struct perf_evsel *counter; +struct evsel *counter;int ret;evlist__for_each_entry (evsel_list, counter) {
@@ -389,7 +389,7 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf workload_exec_errno = info->si_value.sival_int; } -static bool perf_evsel__should_store_id (struct perf_evsel *counter) +static bool perf_evsel__should_store_id (struct evsel *counter) {return STAT_RECORD || counter->attr.read_format &PERF_FORMAT_ID ; }
@@ -423,7 +423,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)int timeout = stat_config.timeout;char msg[BUFSIZ ];unsigned long long t0, t1; -struct perf_evsel *counter; +struct evsel *counter;struct timespec ts;size_t l;int status =0 ;
@@ -868,7 +868,7 @@ static int perf_stat__get_core_cached(struct perf_stat_config *config,static bool term_percore_set (void ) { -struct perf_evsel *counter; +struct evsel *counter;evlist__for_each_entry (evsel_list, counter) {if (counter->percore)
@@ -1462,7 +1462,7 @@ static int process_stat_round_event(struct perf_session *session, union perf_event *event) {struct stat_round_event *stat_round = &event->stat_round; -struct perf_evsel *counter; +struct evsel *counter;struct timespec tsh, *ts =NULL ;const char **argv = session->header.env.cmdline_argv;int argc = session->header.env.nr_cmdline;
@@ -1676,7 +1676,7 @@ static void setup_system_wide(int forks)if (!forks) target.system_wide = true;else { -struct perf_evsel *counter; +struct evsel *counter;evlist__for_each_entry (evsel_list, counter) {if (!counter->system_wide)
tools/perf/builtin-timechart.c +22 -22
176 lines not on this page · raw message
tools/perf/builtin-top.c +15 -15
@@ -101,7 +101,7 @@ static void perf_top__resize(struct perf_top *top)static int perf_top__parse_source (struct perf_top *top,struct hist_entry *he) { -struct perf_evsel *evsel; +struct evsel *evsel;struct symbol *sym;struct annotation *notes;struct map *map;
@@ -186,7 +186,7 @@ static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip)static void perf_top__record_precise_ip (struct perf_top *top,struct hist_entry *he,struct perf_sample *sample, -struct perf_evsel *evsel,u64 ip) +struct evsel *evsel,u64 ip) {struct annotation *notes;struct symbol *sym = he->ms.sym;
@@ -228,7 +228,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,static void perf_top__show_details (struct perf_top *top) {struct hist_entry *he = top->sym_filter_entry; -struct perf_evsel *evsel; +struct evsel *evsel;struct annotation *notes;struct symbol *symbol;int more;
@@ -270,7 +270,7 @@ static void perf_top__print_sym_table(struct perf_top *top)char bf[160 ];int printed =0 ;const int win_width = top->winsize.ws_col -1 ; -struct perf_evsel *evsel = top->sym_evsel; +struct evsel *evsel = top->sym_evsel;struct hists *hists =evsel__hists (evsel);puts (CONSOLE_CLEAR );
@@ -554,7 +554,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)static void perf_top__sort_new_samples (void *arg) {struct perf_top *t = arg; -struct perf_evsel *evsel = t->sym_evsel; +struct evsel *evsel = t->sym_evsel;struct hists *hists;if (t->evlist->selected !=NULL )
@@ -586,7 +586,7 @@ static void stop_top(void)static void *display_thread_tui (void *arg) { -struct perf_evsel *pos; +struct evsel *pos;struct perf_top *top = arg;const char *help ="For a higher level overview, try: perf top --sort comm,dso" ;struct hist_browser_timer hbt = {
@@ -693,7 +693,7 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter, {struct perf_top *top = arg;struct hist_entry *he = iter->he; -struct perf_evsel *evsel = iter->evsel; +struct evsel *evsel = iter->evsel;if (perf_hpp_list.sym && single)perf_top__record_precise_ip (top, he, iter->sample, evsel, al->addr);
@@ -705,7 +705,7 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter,static void perf_event__process_sample (struct perf_tool *tool,const union perf_event *event, -struct perf_evsel *evsel, +struct evsel *evsel,struct perf_sample *sample,struct machine *machine) {
@@ -813,7 +813,7 @@ static void perf_event__process_sample(struct perf_tool *tool,static void perf_top__process_lost (struct perf_top *top,union perf_event *event, -struct perf_evsel *evsel) +struct evsel *evsel) {struct hists *hists =evsel__hists (evsel);
@@ -825,7 +825,7 @@ perf_top__process_lost(struct perf_top *top, union perf_event *event,static void perf_top__process_lost_samples (struct perf_top *top,union perf_event *event, -struct perf_evsel *evsel) +struct evsel *evsel) {struct hists *hists =evsel__hists (evsel);
@@ -912,7 +912,7 @@ static int perf_top__overwrite_check(struct perf_top *top)struct perf_evlist *evlist = top->evlist;struct perf_evsel_config_term *term;struct list_head *config_terms; -struct perf_evsel *evsel; +struct evsel *evsel;int set, overwrite =-1 ;evlist__for_each_entry (evlist, evsel) {
@@ -952,11 +952,11 @@ static int perf_top__overwrite_check(struct perf_top *top) }static int perf_top_overwrite_fallback (struct perf_top *top, -struct perf_evsel *evsel) +struct evsel *evsel) {struct record_opts *opts = &top->record_opts;struct perf_evlist *evlist = top->evlist; -struct perf_evsel *counter; +struct evsel *counter;if (!opts->overwrite)return 0 ;
@@ -975,7 +975,7 @@ static int perf_top_overwrite_fallback(struct perf_top *top,static int perf_top__start_counters (struct perf_top *top) {char msg[BUFSIZ ]; -struct perf_evsel *counter; +struct evsel *counter;struct perf_evlist *evlist = top->evlist;struct record_opts *opts = &top->record_opts;
@@ -1104,7 +1104,7 @@ static int deliver_event(struct ordered_events *qe,struct perf_session *session = top->session;union perf_event *event = qevent->event;struct perf_sample sample; -struct perf_evsel *evsel; +struct evsel *evsel;struct machine *machine;int ret =-1 ;
tools/perf/builtin-trace.c +38 -38
291 lines not on this page · raw message
tools/perf/tests/backward-ring-buffer.c +1 -1
@@ -83,7 +83,7 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __mint ret =TEST_SKIP , err, sample_count =0 , comm_count =0 ;char pid[16 ], sbuf[STRERR_BUFSIZE ];struct perf_evlist *evlist; -struct perf_evsel *evsel__maybe_unused ; +struct evsel *evsel__maybe_unused ;struct parse_events_error parse_error;struct record_opts opts = { .target = {
tools/perf/tests/code-reading.c +1 -1
@@ -555,7 +555,7 @@ static int do_test_code_reading(bool try_kcore)struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ; -struct perf_evsel *evsel =NULL ; +struct evsel *evsel =NULL ;int err =-1 , ret;pid_t pid;struct map *map;
tools/perf/tests/event-times.c +7 -7
@@ -14,7 +14,7 @@static int attach__enable_on_exec (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);struct target target = { .uid =UINT_MAX , };
@@ -56,7 +56,7 @@ static int detach__enable_on_exec(struct perf_evlist *evlist)static int attach__current_disabled (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);struct perf_thread_map *threads;int err;
@@ -82,7 +82,7 @@ static int attach__current_disabled(struct perf_evlist *evlist)static int attach__current_enabled (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);struct perf_thread_map *threads;int err;
@@ -102,14 +102,14 @@ static int attach__current_enabled(struct perf_evlist *evlist)static int detach__disable (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);return perf_evsel__enable (evsel); }static int attach__cpu_disabled (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);struct perf_cpu_map *cpus;int err;
@@ -138,7 +138,7 @@ static int attach__cpu_disabled(struct perf_evlist *evlist)static int attach__cpu_enabled (struct perf_evlist *evlist) { -struct perf_evsel *evsel =perf_evlist__last (evlist); +struct evsel *evsel =perf_evlist__last (evlist);struct perf_cpu_map *cpus;int err;
@@ -163,7 +163,7 @@ static int test_times(int (attach)(struct perf_evlist *), {struct perf_counts_values count;struct perf_evlist *evlist =NULL ; -struct perf_evsel *evsel; +struct evsel *evsel;int err =-1 , i; evlist =perf_evlist__new ();
tools/perf/tests/event_update.c +1 -1
@@ -80,7 +80,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,int test__event_update (struct test *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_evlist *evlist; -struct perf_evsel *evsel; +struct evsel *evsel;struct event_name tmp; evlist =perf_evlist__new_default ();
tools/perf/tests/evsel-roundtrip-name.c +2 -2
@@ -11,7 +11,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) {char name[128 ];int type, op, err =0 , ret =0 , i, idx; -struct perf_evsel *evsel; +struct evsel *evsel;struct perf_evlist *evlist =perf_evlist__new ();if (evlist ==NULL )
@@ -67,7 +67,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)static int __perf_evsel__name_array_test (const char *names[],int nr_names) {int i, err; -struct perf_evsel *evsel; +struct evsel *evsel;struct perf_evlist *evlist =perf_evlist__new ();if (evlist ==NULL )
tools/perf/tests/evsel-tp-sched.c +2 -2
@@ -5,7 +5,7 @@#include "tests.h" #include "debug.h" -static int perf_evsel__test_field (struct perf_evsel *evsel,const char *name, +static int perf_evsel__test_field (struct evsel *evsel,const char *name,int size,bool should_be_signed) {struct tep_format_field *field =perf_evsel__field (evsel, name);
@@ -35,7 +35,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,int test__perf_evsel__tp_sched_test (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct perf_evsel *evsel =perf_evsel__newtp ("sched" ,"sched_switch" ); +struct evsel *evsel =perf_evsel__newtp ("sched" ,"sched_switch" );int ret =0 ;if (IS_ERR (evsel)) {
tools/perf/tests/hists_cumulate.c +7 -7
@@ -80,7 +80,7 @@ static u64 fake_callchains[][10] = {static int add_hist_entries (struct hists *hists,struct machine *machine) {struct addr_location al; -struct perf_evsel *evsel =hists_to_evsel (hists); +struct evsel *evsel =hists_to_evsel (hists);struct perf_sample sample = { .period =1000 , };size_t i;
@@ -147,7 +147,7 @@ static void del_hist_entries(struct hists *hists) } } -typedef int (*test_fn_t )(struct perf_evsel *,struct machine *); +typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread))#define DSO (he) (he->ms.map->dso->short_name)
@@ -247,7 +247,7 @@ static int do_test(struct hists *hists, struct result *expected, size_t nr_expec }/* NO callchain + NO children */ -static int test1 (struct perf_evsel *evsel,struct machine *machine) +static int test1 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -298,7 +298,7 @@ static int test1(struct perf_evsel *evsel, struct machine *machine) }/* callcain + NO children */ -static int test2 (struct perf_evsel *evsel,struct machine *machine) +static int test2 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -446,7 +446,7 @@ static int test2(struct perf_evsel *evsel, struct machine *machine) }/* NO callchain + children */ -static int test3 (struct perf_evsel *evsel,struct machine *machine) +static int test3 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -503,7 +503,7 @@ static int test3(struct perf_evsel *evsel, struct machine *machine) }/* callchain + children */ -static int test4 (struct perf_evsel *evsel,struct machine *machine) +static int test4 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -694,7 +694,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_uint err =TEST_FAIL ;struct machines machines;struct machine *machine; -struct perf_evsel *evsel; +struct evsel *evsel;struct perf_evlist *evlist =perf_evlist__new ();size_t i;test_fn_t testcases[] = {
tools/perf/tests/hists_filter.c +2 -2
@@ -50,7 +50,7 @@ static struct sample fake_samples[] = {static int add_hist_entries (struct perf_evlist *evlist,struct machine *machine) { -struct perf_evsel *evsel; +struct evsel *evsel;struct addr_location al;struct perf_sample sample = { .period =100 , };size_t i;
@@ -108,7 +108,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unuint err =TEST_FAIL ;struct machines machines;struct machine *machine; -struct perf_evsel *evsel; +struct evsel *evsel;struct perf_evlist *evlist =perf_evlist__new ();TEST_ASSERT_VAL ("No memory" , evlist);
tools/perf/tests/hists_link.c +2 -2
@@ -64,7 +64,7 @@ static struct sample fake_samples[][5] = {static int add_hist_entries (struct perf_evlist *evlist,struct machine *machine) { -struct perf_evsel *evsel; +struct evsel *evsel;struct addr_location al;struct hist_entry *he;struct perf_sample sample = { .period =1 , .weight =1 , };
@@ -271,7 +271,7 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unusestruct hists *hists, *first_hists;struct machines machines;struct machine *machine =NULL ; -struct perf_evsel *evsel, *first; +struct evsel *evsel, *first;struct perf_evlist *evlist =perf_evlist__new ();if (evlist ==NULL )
tools/perf/tests/hists_output.c +8 -8
@@ -50,7 +50,7 @@ static struct sample fake_samples[] = {static int add_hist_entries (struct hists *hists,struct machine *machine) {struct addr_location al; -struct perf_evsel *evsel =hists_to_evsel (hists); +struct evsel *evsel =hists_to_evsel (hists);struct perf_sample sample = { .period =100 , };size_t i;
@@ -113,7 +113,7 @@ static void del_hist_entries(struct hists *hists) } } -typedef int (*test_fn_t )(struct perf_evsel *,struct machine *); +typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread))#define DSO (he) (he->ms.map->dso->short_name)
@@ -122,7 +122,7 @@ typedef int (*test_fn_t)(struct perf_evsel *, struct machine *);#define PID (he) (he->thread->tid)/* default sort keys (no field) */ -static int test1 (struct perf_evsel *evsel,struct machine *machine) +static int test1 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -224,7 +224,7 @@ static int test1(struct perf_evsel *evsel, struct machine *machine) }/* mixed fields and sort keys */ -static int test2 (struct perf_evsel *evsel,struct machine *machine) +static int test2 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -280,7 +280,7 @@ static int test2(struct perf_evsel *evsel, struct machine *machine) }/* fields only (no sort key) */ -static int test3 (struct perf_evsel *evsel,struct machine *machine) +static int test3 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -354,7 +354,7 @@ static int test3(struct perf_evsel *evsel, struct machine *machine) }/* handle duplicate 'dso' field */ -static int test4 (struct perf_evsel *evsel,struct machine *machine) +static int test4 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -456,7 +456,7 @@ static int test4(struct perf_evsel *evsel, struct machine *machine) }/* full sort keys w/o overhead field */ -static int test5 (struct perf_evsel *evsel,struct machine *machine) +static int test5 (struct evsel *evsel,struct machine *machine) {int err;struct hists *hists =evsel__hists (evsel);
@@ -580,7 +580,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unuint err =TEST_FAIL ;struct machines machines;struct machine *machine; -struct perf_evsel *evsel; +struct evsel *evsel;struct perf_evlist *evlist =perf_evlist__new ();size_t i;test_fn_t testcases[] = {
tools/perf/tests/keep-tracking.c +1 -1
@@ -68,7 +68,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unstruct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ;struct perf_evlist *evlist =NULL ; -struct perf_evsel *evsel =NULL ; +struct evsel *evsel =NULL ;int found, err =-1 ;const char *comm;
tools/perf/tests/mmap-basic.c +1 -1
@@ -36,7 +36,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse#define nsyscalls ARRAY_SIZE(syscall_names)unsigned int nr_events[nsyscalls], expected_nr_events[nsyscalls], i, j; -struct perf_evsel *evsels[nsyscalls], *evsel; +struct evsel *evsels[nsyscalls], *evsel;char sbuf[STRERR_BUFSIZE ];struct perf_mmap *md;
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -21,7 +21,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int {int err =-1 , fd, cpu;struct perf_cpu_map *cpus; -struct perf_evsel *evsel; +struct evsel *evsel;unsigned int nr_openat_calls =111 , i;cpu_set_t cpu_set;struct perf_thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -33,7 +33,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtestconst char *filename ="/etc/passwd" ;int flags =O_RDONLY |O_DIRECTORY ;struct perf_evlist *evlist =perf_evlist__new (); -struct perf_evsel *evsel; +struct evsel *evsel;int err =-1 , i, nr_events =0 , nr_polls =0 ;char sbuf[STRERR_BUFSIZE ];
tools/perf/tests/openat-syscall.c +1 -1
@@ -14,7 +14,7 @@int test__openat_syscall_event (struct test *test__maybe_unused ,int subtest__maybe_unused ) {int err =-1 , fd; -struct perf_evsel *evsel; +struct evsel *evsel;unsigned int nr_openat_calls =111 , i;struct perf_thread_map *threads =thread_map__new (-1 ,getpid (),UINT_MAX );char sbuf[STRERR_BUFSIZE ];
tools/perf/tests/parse-events.c +60 -60
429 lines not on this page · raw message
tools/perf/util/evlist.c +71 -71
142 lines not on this page · raw message
tools/perf/util/evlist.h +23 -23
46 lines not on this page · raw message
tools/perf/util/evsel.c +84 -84
168 lines not on this page · raw message
tools/perf/util/evsel.h +73 -73
146 lines not on this page · raw message
tools/perf/util/header.c +29 -29
58 lines not on this page · raw message
tools/perf/util/parse-events.c +24 -24
48 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-perl.c +4 -4
Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +11 -11
Lines of this file are not shown. View the raw message.
tools/perf/util/stat-display.c +30 -30
60 lines not on this page · raw message
tools/perf/util/trace-event-scripting.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0
Part of the diff is not shown here. View the raw message.
Arnaldo Carvalho de Melo
maintainerPATCH 32/107 perf evlist: Rename struct perf_evlist to struct evlist
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename struct perf_evlist to struct evlist, so we don't have a name clash when we add struct perf_evlist in libperf.
Committer notes:
Added fixes to build on arm64, from Jiri and from me (tools/perf/util/cs-etm.c)
--- tools/perf/arch/arm/util/auxtrace.c | 2 +- tools/perf/arch/arm/util/cs-etm.c | 8 +- tools/perf/arch/arm64/util/arm-spe.c | 6 +- tools/perf/arch/powerpc/util/kvm-stat.c | 6 +- tools/perf/arch/s390/util/auxtrace.c | 6 +- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/auxtrace.c | 4 +- tools/perf/arch/x86/util/intel-bts.c | 6 +- tools/perf/arch/x86/util/intel-pt.c | 14 +- tools/perf/builtin-c2c.c | 4 +- tools/perf/builtin-diff.c | 8 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/builtin-inject.c | 8 +- tools/perf/builtin-kvm.c | 8 +- tools/perf/builtin-record.c | 14 +- tools/perf/builtin-report.c | 8 +- tools/perf/builtin-sched.c | 4 +- tools/perf/builtin-script.c | 10 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 14 +- tools/perf/builtin-trace.c | 16 +- tools/perf/tests/backward-ring-buffer.c | 6 +- tools/perf/tests/bpf.c | 2 +- tools/perf/tests/code-reading.c | 8 +- tools/perf/tests/event-times.c | 20 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 +- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 4 +- tools/perf/tests/hists_link.c | 4 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 4 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/parse-events.c | 126 ++++++------ tools/perf/tests/parse-no-sample-id-all.c | 4 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 10 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/time-utils-test.c | 2 +- tools/perf/ui/browsers/hists.c | 6 +- tools/perf/ui/gtk/gtk.h | 4 +- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/ui/hist.c | 2 +- tools/perf/util/auxtrace.c | 10 +- tools/perf/util/auxtrace.h | 24 +-- tools/perf/util/bpf-event.c | 2 +- tools/perf/util/bpf-event.h | 4 +- tools/perf/util/bpf-loader.c | 20 +- tools/perf/util/bpf-loader.h | 24 +-- tools/perf/util/cgroup.c | 10 +- tools/perf/util/cgroup.h | 6 +- tools/perf/util/cs-etm.c | 4 +- tools/perf/util/data-convert-bt.c | 4 +- tools/perf/util/evlist.c | 194 +++++++++---------- tools/perf/util/evlist.h | 160 +++++++-------- tools/perf/util/evsel.c | 4 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 86 ++++---- tools/perf/util/header.h | 16 +- tools/perf/util/hist.c | 2 +- tools/perf/util/hist.h | 10 +- tools/perf/util/intel-bts.c | 2 +- tools/perf/util/intel-pt.c | 10 +- tools/perf/util/kvm-stat.h | 4 +- tools/perf/util/metricgroup.c | 6 +- tools/perf/util/mmap.c | 2 +- tools/perf/util/parse-events.c | 10 +- tools/perf/util/parse-events.h | 6 +- tools/perf/util/python.c | 16 +- tools/perf/util/record.c | 8 +- tools/perf/util/s390-sample-raw.c | 2 +- tools/perf/util/sample-raw.c | 2 +- tools/perf/util/sample-raw.h | 6 +- tools/perf/util/session.c | 24 +-- tools/perf/util/session.h | 4 +- tools/perf/util/sort.c | 20 +- tools/perf/util/sort.h | 6 +- tools/perf/util/stat-display.c | 18 +- tools/perf/util/stat-shadow.c | 4 +- tools/perf/util/stat.c | 8 +- tools/perf/util/stat.h | 14 +- tools/perf/util/tool.h | 4 +- tools/perf/util/top.h | 4 +- 86 files changed, 571 insertions(+), 571 deletions(-)
tools/perf/arch/arm/util/auxtrace.c +1 -1
@@ -50,7 +50,7 @@ static struct perf_pmu **find_all_arm_spe_pmus(int *nr_spes, int *err) }struct auxtrace_record -*auxtrace_record__init (struct perf_evlist *evlist,int *err) +*auxtrace_record__init (struct evlist *evlist,int *err) {struct perf_pmu *cs_etm_pmu;struct evsel *evsel;
tools/perf/arch/arm/util/cs-etm.c +4 -4
@@ -32,7 +32,7 @@struct cs_etm_recording {struct auxtrace_record itr;struct perf_pmu *cs_etm_pmu; -struct perf_evlist *evlist; +struct evlist *evlist;int wrapped_cnt;bool *wrapped;bool snapshot_mode;
@@ -245,7 +245,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, }static int cs_etm_recording_options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts) {int ret;
@@ -434,7 +434,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr)struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu; -struct perf_evlist *evlist = ptr->evlist; +struct evlist *evlist = ptr->evlist;struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {
@@ -485,7 +485,7 @@ static u64 cs_etmv4_get_config(struct auxtrace_record *itr)static size_t cs_etm_info_priv_size (struct auxtrace_record *itr__maybe_unused , -struct perf_evlist *evlist__maybe_unused ) +struct evlist *evlist__maybe_unused ) {int i;int etmv3 =0 , etmv4 =0 ;
tools/perf/arch/arm64/util/arm-spe.c +3 -3
@@ -27,12 +27,12 @@struct arm_spe_recording {struct auxtrace_record itr;struct perf_pmu *arm_spe_pmu; -struct perf_evlist *evlist; +struct evlist *evlist; };static size_t arm_spe_info_priv_size (struct auxtrace_record *itr__maybe_unused , -struct perf_evlist *evlist__maybe_unused ) +struct evlist *evlist__maybe_unused ) {return ARM_SPE_AUXTRACE_PRIV_SIZE ; }
@@ -59,7 +59,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr, }static int arm_spe_recording_options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts) { struct arm_spe_recording *sper =
tools/perf/arch/powerpc/util/kvm-stat.c +3 -3
@@ -106,7 +106,7 @@ const char * const kvm_skip_events[] = { }; -static int is_tracepoint_available (const char *str,struct perf_evlist *evlist) +static int is_tracepoint_available (const char *str,struct evlist *evlist) {struct parse_events_error err;int ret;
@@ -119,7 +119,7 @@ static int is_tracepoint_available(const char *str, struct perf_evlist *evlist) }static int ppc__setup_book3s_hv (struct perf_kvm_stat *kvm, -struct perf_evlist *evlist) +struct evlist *evlist) {const char **events_ptr;int i, nr_tp =0 , err =-1 ;
@@ -146,7 +146,7 @@ static int ppc__setup_book3s_hv(struct perf_kvm_stat *kvm,/* Wrapper to setup kvm tracepoints */ static int ppc__setup_kvm_tp (struct perf_kvm_stat *kvm) { -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/arch/s390/util/auxtrace.c +3 -3
@@ -20,7 +20,7 @@ static void cpumsf_free(struct auxtrace_record *itr) }static size_t cpumsf_info_priv_size (struct auxtrace_record *itr__maybe_unused , -struct perf_evlist *evlist__maybe_unused ) +struct evlist *evlist__maybe_unused ) {return 0 ; }
@@ -43,7 +43,7 @@ cpumsf_reference(struct auxtrace_record *itr __maybe_unused)static int cpumsf_recording_options (struct auxtrace_record *ar__maybe_unused , -struct perf_evlist *evlist__maybe_unused , +struct evlist *evlist__maybe_unused ,struct record_opts *opts) {unsigned int factor =1 ;
@@ -82,7 +82,7 @@ cpumsf_parse_snapshot_options(struct auxtrace_record *itr __maybe_unused,* auxtrace_record__init is called when perf record * check if the event really need auxtrace */ -struct auxtrace_record *auxtrace_record__init (struct perf_evlist *evlist, +struct auxtrace_record *auxtrace_record__init (struct evlist *evlist,int *err) {struct auxtrace_record *aux;
tools/perf/arch/x86/tests/intel-cqm.c +1 -1
@@ -40,7 +40,7 @@ static pid_t spawn(void)*/ int test__intel_cqm_count_nmi_context (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel =NULL ;struct perf_event_attr pe;int i, fd[2 ], flag, ret;
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -51,7 +51,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe };struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ; -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel =NULL ;int err =-1 , ret, i;const char *comm1, *comm2;
tools/perf/arch/x86/util/auxtrace.c +2 -2
@@ -16,7 +16,7 @@#include "../../util/evlist.h" static -struct auxtrace_record *auxtrace_record__init_intel (struct perf_evlist *evlist, +struct auxtrace_record *auxtrace_record__init_intel (struct evlist *evlist,int *err) {struct perf_pmu *intel_pt_pmu;
@@ -50,7 +50,7 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist,return NULL ; } -struct auxtrace_record *auxtrace_record__init (struct perf_evlist *evlist, +struct auxtrace_record *auxtrace_record__init (struct evlist *evlist,int *err) {char buffer[64 ];
tools/perf/arch/x86/util/intel-bts.c +3 -3
@@ -35,7 +35,7 @@ struct intel_bts_snapshot_ref {struct intel_bts_recording {struct auxtrace_record itr;struct perf_pmu *intel_bts_pmu; -struct perf_evlist *evlist; +struct evlist *evlist;bool snapshot_mode;size_t snapshot_size;int snapshot_ref_cnt;
@@ -50,7 +50,7 @@ struct branch {static size_t intel_bts_info_priv_size (struct auxtrace_record *itr__maybe_unused , -struct perf_evlist *evlist__maybe_unused ) +struct evlist *evlist__maybe_unused ) {return INTEL_BTS_AUXTRACE_PRIV_SIZE ; }
@@ -99,7 +99,7 @@ static int intel_bts_info_fill(struct auxtrace_record *itr, }static int intel_bts_recording_options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts) { struct intel_bts_recording *btsr =
tools/perf/arch/x86/util/intel-pt.c +7 -7
@@ -44,7 +44,7 @@ struct intel_pt_recording {struct auxtrace_record itr;struct perf_pmu *intel_pt_pmu;int have_sched_switch; -struct perf_evlist *evlist; +struct evlist *evlist;bool snapshot_mode;bool snapshot_init_done;size_t snapshot_size;
@@ -110,7 +110,7 @@ static u64 intel_pt_masked_bits(u64 mask, u64 bits) }static int intel_pt_read_config (struct perf_pmu *intel_pt_pmu,const char *str, -struct perf_evlist *evlist,u64 *res) +struct evlist *evlist,u64 *res) {struct evsel *evsel;u64 mask;
@@ -132,7 +132,7 @@ static int intel_pt_read_config(struct perf_pmu *intel_pt_pmu, const char *str, }static size_t intel_pt_psb_period (struct perf_pmu *intel_pt_pmu, -struct perf_evlist *evlist) +struct evlist *evlist) {u64 val;int err, topa_multiple_entries;
@@ -268,7 +268,7 @@ intel_pt_pmu_default_config(struct perf_pmu *intel_pt_pmu)return attr; } -static const char *intel_pt_find_filter (struct perf_evlist *evlist, +static const char *intel_pt_find_filter (struct evlist *evlist,struct perf_pmu *intel_pt_pmu) {struct evsel *evsel;
@@ -289,7 +289,7 @@ static size_t intel_pt_filter_bytes(const char *filter) }static size_t -intel_pt_info_priv_size (struct auxtrace_record *itr,struct perf_evlist *evlist) +intel_pt_info_priv_size (struct auxtrace_record *itr,struct evlist *evlist) {struct intel_pt_recording *ptr = container_of(itr, struct intel_pt_recording, itr);
@@ -398,7 +398,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,return 0 ; } -static int intel_pt_track_switches (struct perf_evlist *evlist) +static int intel_pt_track_switches (struct evlist *evlist) {const char *sched_switch ="sched:sched_switch" ;struct evsel *evsel;
@@ -549,7 +549,7 @@ static int intel_pt_validate_config(struct perf_pmu *intel_pt_pmu, }static int intel_pt_recording_options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts) { struct intel_pt_recording *ptr =
tools/perf/builtin-c2c.c +2 -2
@@ -2236,7 +2236,7 @@ static void print_pareto(FILE *out)static void print_c2c_info (FILE *out,struct perf_session *session) { -struct perf_evlist *evlist = session->evlist; +struct evlist *evlist = session->evlist;struct evsel *evsel;bool first = true;
@@ -2567,7 +2567,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)return parse_callchain_report_opt (arg); } -static int setup_callchain (struct perf_evlist *evlist) +static int setup_callchain (struct evlist *evlist) {u64 sample_type =perf_evlist__combined_sample_type (evlist);enum perf_call_graph_mode mode =CALLCHAIN_NONE ;
tools/perf/builtin-diff.c +4 -4
@@ -449,7 +449,7 @@ static struct perf_diff pdiff = { };static struct evsel *evsel_match (struct evsel *evsel, -struct perf_evlist *evlist) +struct evlist *evlist) {struct evsel *e;
@@ -461,7 +461,7 @@ static struct evsel *evsel_match(struct evsel *evsel,return NULL ; } -static void perf_evlist__collapse_resort (struct perf_evlist *evlist) +static void perf_evlist__collapse_resort (struct evlist *evlist) {struct evsel *evsel;
@@ -1009,7 +1009,7 @@ static void data__fprintf(void)static void data_process (void ) { -struct perf_evlist *evlist_base = data__files[0 ].session->evlist; +struct evlist *evlist_base = data__files[0 ].session->evlist;struct evsel *evsel_base;bool first = true;
@@ -1019,7 +1019,7 @@ static void data_process(void)int i;data__for_each_file_new (i, d) { -struct perf_evlist *evlist = d->session->evlist; +struct evlist *evlist = d->session->evlist;struct evsel *evsel;struct hists *hists;
tools/perf/builtin-ftrace.c +1 -1
@@ -27,7 +27,7 @@#define DEFAULT_TRACER "function_graph"struct perf_ftrace { -struct perf_evlist *evlist; +struct evlist *evlist;struct target target;const char *tracer;struct list_head filters;
tools/perf/builtin-inject.c +4 -4
@@ -96,7 +96,7 @@ static int perf_event__repipe_op2_synth(struct perf_session *session,static int perf_event__repipe_attr (struct perf_tool *tool,union perf_event *event, -struct perf_evlist **pevlist) +struct evlist **pevlist) { struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
@@ -567,7 +567,7 @@ static int drop_sample(struct perf_tool *tool __maybe_unused,static void strip_init (struct perf_inject *inject) { -struct perf_evlist *evlist = inject->session->evlist; +struct evlist *evlist = inject->session->evlist;struct evsel *evsel; inject->tool.context_switch = perf_event__drop;
@@ -590,7 +590,7 @@ static bool has_tracking(struct evsel *evsel)* their selected event to exist, except if there is only 1 selected event left * and it has a compatible sample type. */ -static bool ok_to_remove (struct perf_evlist *evlist, +static bool ok_to_remove (struct evlist *evlist,struct evsel *evsel_to_remove) {struct evsel *evsel;
@@ -614,7 +614,7 @@ static bool ok_to_remove(struct perf_evlist *evlist,static void strip_fini (struct perf_inject *inject) { -struct perf_evlist *evlist = inject->session->evlist; +struct evlist *evlist = inject->session->evlist;struct evsel *evsel, *tmp;/* Remove non-synthesized evsels if possible */
tools/perf/builtin-kvm.c +4 -4
@@ -743,7 +743,7 @@ static bool verify_vcpu(int vcpu)static s64 perf_kvm__mmap_read_idx (struct perf_kvm_stat *kvm,int idx,u64 *mmap_time) { -struct perf_evlist *evlist = kvm->evlist; +struct evlist *evlist = kvm->evlist;union perf_event *event;struct perf_mmap *md;u64 timestamp;
@@ -1012,7 +1012,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) {int err, rc =-1 ;struct evsel *pos; -struct perf_evlist *evlist = kvm->evlist; +struct evlist *evlist = kvm->evlist;char sbuf[STRERR_BUFSIZE ];perf_evlist__config (evlist, &kvm->opts,NULL );
@@ -1283,9 +1283,9 @@ kvm_events_report(struct perf_kvm_stat *kvm, int argc, const char **argv) }#ifdef HAVE_TIMERFD_SUPPORT -static struct perf_evlist *kvm_live_event_list (void ) +static struct evlist *kvm_live_event_list (void ) { -struct perf_evlist *evlist; +struct evlist *evlist;char *tp, *name, *sys;int err =-1 ;const char *const *events_tp;
tools/perf/builtin-record.c +7 -7
@@ -73,7 +73,7 @@ struct record {u64 bytes_written;struct perf_data data;struct auxtrace_record *itr; -struct perf_evlist *evlist; +struct evlist *evlist;struct perf_session *session;int realtime_prio;bool no_buildid;
@@ -346,7 +346,7 @@ static void record__aio_set_pos(int trace_fd, off_t pos)static void record__aio_mmap_read_sync (struct record *rec) {int i; -struct perf_evlist *evlist = rec->evlist; +struct evlist *evlist = rec->evlist;struct perf_mmap *maps = evlist->mmap;if (!record__aio_enabled (rec))
@@ -672,7 +672,7 @@ static int record__auxtrace_init(struct record *rec __maybe_unused)#endif static int record__mmap_evlist (struct record *rec, -struct perf_evlist *evlist) +struct evlist *evlist) {struct record_opts *opts = &rec->opts;char msg[512 ];
@@ -714,7 +714,7 @@ static int record__open(struct record *rec) {char msg[BUFSIZ ];struct evsel *pos; -struct perf_evlist *evlist = rec->evlist; +struct evlist *evlist = rec->evlist;struct perf_session *session = rec->session;struct record_opts *opts = &rec->opts;int rc =0 ;
@@ -904,7 +904,7 @@ static size_t zstd_compress(struct perf_session *session, void *dst, size_t dst_return compressed; } -static int record__mmap_read_evlist (struct record *rec,struct perf_evlist *evlist, +static int record__mmap_read_evlist (struct record *rec,struct evlist *evlist,bool overwrite,bool synch) {u64 bytes_written = rec->bytes_written;
@@ -1165,7 +1165,7 @@ perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused }static const struct perf_event_mmap_page * -perf_evlist__pick_pc (struct perf_evlist *evlist) +perf_evlist__pick_pc (struct evlist *evlist) {if (evlist) {if (evlist->mmap && evlist->mmap[0 ].base)
@@ -1313,7 +1313,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)struct perf_data *data = &rec->data;struct perf_session *session;bool disabled = false, draining = false; -struct perf_evlist *sb_evlist =NULL ; +struct evlist *sb_evlist =NULL ;int fd;float ratio =0 ;
tools/perf/builtin-report.c +4 -4
@@ -193,7 +193,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, }static void setup_forced_leader (struct report *report, -struct perf_evlist *evlist) +struct evlist *evlist) {if (report->group_set)perf_evlist__force_leader (evlist);
@@ -459,7 +459,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportreturn ret +fprintf (fp,"\n#\n" ); } -static int perf_evlist__tty_browse_hists (struct perf_evlist *evlist, +static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help) {
@@ -532,7 +532,7 @@ static void report__warn_kptr_restrict(const struct report *rep)static int report__gtk_browse_hists (struct report *rep,const char *help) { -int (*hist_browser)(struct perf_evlist *evlist,const char *help, +int (*hist_browser)(struct evlist *evlist,const char *help,struct hist_browser_timer *timer,float min_pcnt); hist_browser =dlsym (perf_gtk_handle,"perf_evlist__gtk_browse_hists" );
@@ -549,7 +549,7 @@ static int report__browse_hists(struct report *rep) {int ret;struct perf_session *session = rep->session; -struct perf_evlist *evlist = session->evlist; +struct evlist *evlist = session->evlist;const char *help =perf_tip (system_path (TIPDIR ));if (help ==NULL ) {
tools/perf/builtin-sched.c +2 -2
@@ -2924,7 +2924,7 @@ static int perf_timehist__process_sample(struct perf_tool *tool, }static int timehist_check_attr (struct perf_sched *sched, -struct perf_evlist *evlist) +struct evlist *evlist) {struct evsel *evsel;struct evsel_runtime *er;
@@ -2963,7 +2963,7 @@ static int perf_sched__timehist(struct perf_sched *sched) };struct perf_session *session; -struct perf_evlist *evlist; +struct evlist *evlist;int err =-1 ;/*
tools/perf/builtin-script.c +5 -5
@@ -1636,7 +1636,7 @@ struct perf_script {int range_num; }; -static int perf_evlist__max_name_len (struct perf_evlist *evlist) +static int perf_evlist__max_name_len (struct evlist *evlist) {struct evsel *evsel;int max =0 ;
@@ -2018,10 +2018,10 @@ static int process_sample_event(struct perf_tool *tool, }static int process_attr (struct perf_tool *tool,union perf_event *event, -struct perf_evlist **pevlist) +struct evlist **pevlist) { struct perf_script *scr = container_of(tool, struct perf_script, tool); -struct perf_evlist *evlist; +struct evlist *evlist;struct evsel *evsel, *pos;int err;static struct evsel_script *es;
@@ -2388,7 +2388,7 @@ static void sig_handler(int sig __maybe_unused)static void perf_script__fclose_per_event_dump (struct perf_script *script) { -struct perf_evlist *evlist = script->session->evlist; +struct evlist *evlist = script->session->evlist;struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {
@@ -3256,7 +3256,7 @@ static int process_stat_config_event(struct perf_session *session __maybe_unusedstatic int set_maps (struct perf_script *script) { -struct perf_evlist *evlist = script->session->evlist; +struct evlist *evlist = script->session->evlist;if (!script->cpus || !script->threads)return 0 ;
tools/perf/builtin-stat.c +1 -1
@@ -130,7 +130,7 @@ static const char *smi_cost_attrs = {"}" }; -static struct perf_evlist *evsel_list; +static struct evlist *evsel_list;static struct target target = { .uid =UINT_MAX ,
tools/perf/builtin-top.c +7 -7
@@ -839,7 +839,7 @@ static u64 last_timestamp;static void perf_top__mmap_read_idx (struct perf_top *top,int idx) {struct record_opts *opts = &top->record_opts; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;struct perf_mmap *md;union perf_event *event;
@@ -874,7 +874,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)static void perf_top__mmap_read (struct perf_top *top) {bool overwrite = top->record_opts.overwrite; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;int i;if (overwrite)
@@ -909,7 +909,7 @@ static void perf_top__mmap_read(struct perf_top *top)static int perf_top__overwrite_check (struct perf_top *top) {struct record_opts *opts = &top->record_opts; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;struct perf_evsel_config_term *term;struct list_head *config_terms;struct evsel *evsel;
@@ -955,7 +955,7 @@ static int perf_top_overwrite_fallback(struct perf_top *top, struct evsel *evsel) {struct record_opts *opts = &top->record_opts; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;struct evsel *counter;if (!opts->overwrite)
@@ -976,7 +976,7 @@ static int perf_top__start_counters(struct perf_top *top) {char msg[BUFSIZ ];struct evsel *counter; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;struct record_opts *opts = &top->record_opts;if (perf_top__overwrite_check (top)) {
@@ -1100,7 +1100,7 @@ static int deliver_event(struct ordered_events *qe, struct ordered_event *qevent) {struct perf_top *top = qe->data; -struct perf_evlist *evlist = top->evlist; +struct evlist *evlist = top->evlist;struct perf_session *session = top->session;union perf_event *event = qevent->event;struct perf_sample sample;
@@ -1511,7 +1511,7 @@ int cmd_top(int argc, const char **argv) "Record namespaces events"),OPT_END () }; -struct perf_evlist *sb_evlist =NULL ; +struct evlist *sb_evlist =NULL ;const char *const top_usage[] = {"perf top [<options>]" ,NULL
tools/perf/builtin-trace.c +8 -8
@@ -96,7 +96,7 @@ struct trace {struct bpf_map *map; } dump;struct record_opts opts; -struct perf_evlist *evlist; +struct evlist *evlist;struct machine *host;struct thread *current;struct bpf_object *bpf_obj;
@@ -1388,7 +1388,7 @@ static char *trace__machine__resolve_kernel_addr(void *vmachine, unsigned long lreturn machine__resolve_kernel_addr (vmachine, addrp, modp); } -static int trace__symbols_init (struct trace *trace,struct perf_evlist *evlist) +static int trace__symbols_init (struct trace *trace,struct evlist *evlist) {int err =symbol__init (NULL );
@@ -2616,7 +2616,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)static size_t trace__fprintf_thread_summary (struct trace *trace,FILE *fp); -static bool perf_evlist__add_vfs_getname (struct perf_evlist *evlist) +static bool perf_evlist__add_vfs_getname (struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp;
@@ -2699,7 +2699,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, ststatic int trace__add_syscall_newtp (struct trace *trace) {int ret =-1 ; -struct perf_evlist *evlist = trace->evlist; +struct evlist *evlist = trace->evlist;struct evsel *sys_enter, *sys_exit; sys_enter =perf_evsel__raw_syscall_newtp ("sys_enter" , trace__sys_enter);
@@ -3192,7 +3192,7 @@ static int trace__set_filter_pids(struct trace *trace)static int __trace__deliver_event (struct trace *trace,union perf_event *event) { -struct perf_evlist *evlist = trace->evlist; +struct evlist *evlist = trace->evlist;struct perf_sample sample;int err;
@@ -3250,7 +3250,7 @@ static int ordered_events__deliver_event(struct ordered_events *oe,static int trace__run (struct trace *trace,int argc,const char **argv) { -struct perf_evlist *evlist = trace->evlist; +struct evlist *evlist = trace->evlist;struct evsel *evsel, *pgfault_maj =NULL , *pgfault_min =NULL ;int err =-1 , i;unsigned long before;
@@ -3843,7 +3843,7 @@ static int parse_pagefaults(const struct option *opt, const char *str,return 0 ; } -static void evlist__set_evsel_handler (struct perf_evlist *evlist,void *handler) +static void evlist__set_evsel_handler (struct evlist *evlist,void *handler) {struct evsel *evsel;
@@ -3851,7 +3851,7 @@ static void evlist__set_evsel_handler(struct perf_evlist *evlist, void *handler) evsel->handler = handler; } -static int evlist__set_syscall_tp_fields (struct perf_evlist *evlist) +static int evlist__set_syscall_tp_fields (struct evlist *evlist) {struct evsel *evsel;
tools/perf/tests/backward-ring-buffer.c +3 -3
@@ -25,7 +25,7 @@ static void testcase(void) } } -static int count_samples (struct perf_evlist *evlist,int *sample_count, +static int count_samples (struct evlist *evlist,int *sample_count,int *comm_count) {int i;
@@ -55,7 +55,7 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count,return TEST_OK ; } -static int do_test (struct perf_evlist *evlist,int mmap_pages, +static int do_test (struct evlist *evlist,int mmap_pages,int *sample_count,int *comm_count) {int err;
@@ -82,7 +82,7 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m {int ret =TEST_SKIP , err, sample_count =0 , comm_count =0 ;char pid[16 ], sbuf[STRERR_BUFSIZE ]; -struct perf_evlist *evlist; +struct evlist *evlist;struct evsel *evsel__maybe_unused ;struct parse_events_error parse_error;struct record_opts opts = {
tools/perf/tests/bpf.c +1 -1
@@ -118,7 +118,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),char pid[16 ];char sbuf[STRERR_BUFSIZE ]; -struct perf_evlist *evlist; +struct evlist *evlist;int i, ret =TEST_FAIL , err =0 , count =0 ;struct parse_events_state parse_state;
tools/perf/tests/code-reading.c +4 -4
@@ -362,7 +362,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, }static int process_sample_event (struct machine *machine, -struct perf_evlist *evlist, +struct evlist *evlist,union perf_event *event,struct state *state) {struct perf_sample sample;
@@ -385,7 +385,7 @@ static int process_sample_event(struct machine *machine,return ret; } -static int process_event (struct machine *machine,struct perf_evlist *evlist, +static int process_event (struct machine *machine,struct evlist *evlist,union perf_event *event,struct state *state) {if (event->header.type ==PERF_RECORD_SAMPLE )
@@ -408,7 +408,7 @@ static int process_event(struct machine *machine, struct perf_evlist *evlist,return 0 ; } -static int process_events (struct machine *machine,struct perf_evlist *evlist, +static int process_events (struct machine *machine,struct evlist *evlist,struct state *state) {union perf_event *event;
@@ -554,7 +554,7 @@ static int do_test_code_reading(bool try_kcore) };struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ; -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel =NULL ;int err =-1 , ret;pid_t pid;
tools/perf/tests/event-times.c +10 -10
@@ -12,7 +12,7 @@#include "thread_map.h" #include "target.h" -static int attach__enable_on_exec (struct perf_evlist *evlist) +static int attach__enable_on_exec (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);struct target target = {
@@ -48,13 +48,13 @@ static int attach__enable_on_exec(struct perf_evlist *evlist)return perf_evlist__start_workload (evlist) ==1 ?TEST_OK :TEST_FAIL ; } -static int detach__enable_on_exec (struct perf_evlist *evlist) +static int detach__enable_on_exec (struct evlist *evlist) {waitpid (evlist->workload.pid,NULL ,0 );return 0 ; } -static int attach__current_disabled (struct perf_evlist *evlist) +static int attach__current_disabled (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);struct perf_thread_map *threads;
@@ -80,7 +80,7 @@ static int attach__current_disabled(struct perf_evlist *evlist)return perf_evsel__enable (evsel) ==0 ?TEST_OK :TEST_FAIL ; } -static int attach__current_enabled (struct perf_evlist *evlist) +static int attach__current_enabled (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);struct perf_thread_map *threads;
@@ -100,14 +100,14 @@ static int attach__current_enabled(struct perf_evlist *evlist)return err ==0 ?TEST_OK :TEST_FAIL ; } -static int detach__disable (struct perf_evlist *evlist) +static int detach__disable (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);return perf_evsel__enable (evsel); } -static int attach__cpu_disabled (struct perf_evlist *evlist) +static int attach__cpu_disabled (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);struct perf_cpu_map *cpus;
@@ -136,7 +136,7 @@ static int attach__cpu_disabled(struct perf_evlist *evlist)return perf_evsel__enable (evsel); } -static int attach__cpu_enabled (struct perf_evlist *evlist) +static int attach__cpu_enabled (struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist);struct perf_cpu_map *cpus;
@@ -158,11 +158,11 @@ static int attach__cpu_enabled(struct perf_evlist *evlist)return err ?TEST_FAIL :TEST_OK ; } -static int test_times (int (attach )(struct perf_evlist *), -int (detach )(struct perf_evlist *)) +static int test_times (int (attach )(struct evlist *), +int (detach )(struct evlist *)) {struct perf_counts_values count; -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel;int err =-1 , i;
tools/perf/tests/event_update.c +1 -1
@@ -79,7 +79,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,int test__event_update (struct test *test__maybe_unused ,int subtest__maybe_unused ) { -struct perf_evlist *evlist; +struct evlist *evlist;struct evsel *evsel;struct event_name tmp;
tools/perf/tests/evsel-roundtrip-name.c +2 -2
@@ -12,7 +12,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)char name[128 ];int type, op, err =0 , ret =0 , i, idx;struct evsel *evsel; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();if (evlist ==NULL )return -ENOMEM ;
@@ -68,7 +68,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) {int i, err;struct evsel *evsel; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/tests/hists_cumulate.c +1 -1
@@ -695,7 +695,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_ustruct machines machines;struct machine *machine;struct evsel *evsel; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();size_t i;test_fn_t testcases[] = { test1,
tools/perf/tests/hists_filter.c +2 -2
@@ -47,7 +47,7 @@ static struct sample fake_samples[] = { { .pid = FAKE_PID_BASH, .ip = FAKE_IP_KERNEL_PAGE_FAULT, .socket = 3 }, }; -static int add_hist_entries (struct perf_evlist *evlist, +static int add_hist_entries (struct evlist *evlist,struct machine *machine) {struct evsel *evsel;
@@ -109,7 +109,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unustruct machines machines;struct machine *machine;struct evsel *evsel; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();TEST_ASSERT_VAL ("No memory" , evlist);
tools/perf/tests/hists_link.c +2 -2
@@ -62,7 +62,7 @@ static struct sample fake_samples[][5] = { }, }; -static int add_hist_entries (struct perf_evlist *evlist,struct machine *machine) +static int add_hist_entries (struct evlist *evlist,struct machine *machine) {struct evsel *evsel;struct addr_location al;
@@ -272,7 +272,7 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unusestruct machines machines;struct machine *machine =NULL ;struct evsel *evsel, *first; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/tests/hists_output.c +1 -1
@@ -581,7 +581,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unustruct machines machines;struct machine *machine;struct evsel *evsel; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();size_t i;test_fn_t testcases[] = { test1,
tools/perf/tests/keep-tracking.c +2 -2
@@ -24,7 +24,7 @@ } \ } -static int find_comm (struct perf_evlist *evlist,const char *comm) +static int find_comm (struct evlist *evlist,const char *comm) {union perf_event *event;struct perf_mmap *md;
@@ -67,7 +67,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un };struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ; -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel =NULL ;int found, err =-1 ;const char *comm;
tools/perf/tests/mmap-basic.c +1 -1
@@ -29,7 +29,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuseunion perf_event *event;struct perf_thread_map *threads;struct perf_cpu_map *cpus; -struct perf_evlist *evlist; +struct evlist *evlist;cpu_set_t cpu_set;const char *syscall_names[] = {"getsid" ,"getppid" ,"getpgid" , };pid_t (*syscalls[])(void ) = { (void *)getsid, getppid, (void *)getpgid };
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -32,7 +32,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest };const char *filename ="/etc/passwd" ;int flags =O_RDONLY |O_DIRECTORY ; -struct perf_evlist *evlist =perf_evlist__new (); +struct evlist *evlist =perf_evlist__new ();struct evsel *evsel;int err =-1 , i, nr_events =0 , nr_polls =0 ;char sbuf[STRERR_BUFSIZE ];
tools/perf/tests/parse-events.c +63 -63
504 lines not on this page · raw message
tools/perf/tests/parse-no-sample-id-all.c +2 -2
@@ -11,7 +11,7 @@#include "util.h" #include "debug.h" -static int process_event (struct perf_evlist **pevlist,union perf_event *event) +static int process_event (struct evlist **pevlist,union perf_event *event) {struct perf_sample sample;
@@ -39,7 +39,7 @@ static int process_event(struct perf_evlist **pevlist, union perf_event *event)static int process_events (union perf_event **events,size_t count) { -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;int err =0 ;size_t i;
tools/perf/tests/perf-record.c +1 -1
@@ -50,7 +50,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus };cpu_set_t cpu_mask;size_t cpu_mask_size =sizeof (cpu_mask); -struct perf_evlist *evlist =perf_evlist__new_dummy (); +struct evlist *evlist =perf_evlist__new_dummy ();struct evsel *evsel;struct perf_sample sample;const char *cmd ="sleep" ;
tools/perf/tests/sw-clock.c +1 -1
@@ -28,7 +28,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)char sbuf[STRERR_BUFSIZE ];union perf_event *event;struct evsel *evsel; -struct perf_evlist *evlist; +struct evlist *evlist;struct perf_event_attr attr = { .type =PERF_TYPE_SOFTWARE , .config = clock_id,
tools/perf/tests/switch-tracking.c +5 -5
@@ -113,7 +113,7 @@ static int check_cpu(struct switch_tracking *switch_tracking, int cpu)return 0 ; } -static int process_sample_event (struct perf_evlist *evlist, +static int process_sample_event (struct evlist *evlist,union perf_event *event,struct switch_tracking *switch_tracking) {
@@ -163,7 +163,7 @@ static int process_sample_event(struct perf_evlist *evlist,return 0 ; } -static int process_event (struct perf_evlist *evlist,union perf_event *event, +static int process_event (struct evlist *evlist,union perf_event *event,struct switch_tracking *switch_tracking) {if (event->header.type ==PERF_RECORD_SAMPLE )
@@ -203,7 +203,7 @@ struct event_node {u64 event_time; }; -static int add_event (struct perf_evlist *evlist,struct list_head *events, +static int add_event (struct evlist *evlist,struct list_head *events,union perf_event *event) {struct perf_sample sample;
@@ -252,7 +252,7 @@ static int compar(const void *a, const void *b)return cmp; } -static int process_events (struct perf_evlist *evlist, +static int process_events (struct evlist *evlist,struct switch_tracking *switch_tracking) {union perf_event *event;
@@ -329,7 +329,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ };struct perf_thread_map *threads =NULL ;struct perf_cpu_map *cpus =NULL ; -struct perf_evlist *evlist =NULL ; +struct evlist *evlist =NULL ;struct evsel *evsel, *cpu_clocks_evsel, *cycles_evsel;struct evsel *switch_evsel, *tracking_evsel;const char *comm;
tools/perf/tests/task-exit.c +1 -1
@@ -38,7 +38,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedint err =-1 ;union perf_event *event;struct evsel *evsel; -struct perf_evlist *evlist; +struct evlist *evlist;struct target target = { .uid =UINT_MAX , .uses_mmap = true,
tools/perf/tests/time-utils-test.c +1 -1
@@ -69,7 +69,7 @@ struct test_data {static bool test__perf_time__parse_for_ranges (struct test_data *d) { -struct perf_evlist evlist = { +struct evlist evlist = { .first_sample_time = d->first, .last_sample_time = d->last, };
tools/perf/ui/browsers/hists.c +3 -3
@@ -3262,7 +3262,7 @@ static int perf_evsel_menu__run(struct evsel_menu *menu, struct hist_browser_timer *hbt, bool warn_lost_event) { -struct perf_evlist *evlist = menu->b.priv; +struct evlist *evlist = menu->b.priv;struct evsel *pos;const char *title ="Available samples" ;int delay_secs = hbt ? hbt->refresh :0 ;
@@ -3359,7 +3359,7 @@ static bool filter_group_entries(struct ui_browser *browser __maybe_unused,return false; } -static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, +static int __perf_evlist__tui_browse_hists(struct evlist *evlist, int nr_entries, const char *help, struct hist_browser_timer *hbt, float min_pcnt,
@@ -3397,7 +3397,7 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, hbt, warn_lost_event); } -int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, +int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help, struct hist_browser_timer *hbt, float min_pcnt, struct perf_env *env,
tools/perf/ui/gtk/gtk.h +2 -2
@@ -53,11 +53,11 @@ static inline GtkWidget *perf_gtk__setup_info_bar(void)#endif struct evsel ; -struct perf_evlist ; +struct evlist ;struct hist_entry ;struct hist_browser_timer ; -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, +int perf_evlist__gtk_browse_hists (struct evlist *evlist,const char *help,struct hist_browser_timer *hbt,float min_pcnt); int hist_entry__gtk_annotate(struct hist_entry *he,
tools/perf/ui/gtk/hists.c +1 -1
@@ -590,7 +590,7 @@ static void perf_gtk__show_hierarchy(GtkWidget *window, struct hists *hists,gtk_container_add (GTK_CONTAINER (window), view); } -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist, +int perf_evlist__gtk_browse_hists (struct evlist *evlist,const char *help,struct hist_browser_timer *hbt__maybe_unused ,float min_pcnt)
tools/perf/ui/hist.c +1 -1
@@ -795,7 +795,7 @@ static int add_hierarchy_fmt(struct hists *hists, struct perf_hpp_fmt *fmt) }int perf_hpp__setup_hists_formats (struct perf_hpp_list *list, -struct perf_evlist *evlist) +struct evlist *evlist) {struct evsel *evsel;struct perf_hpp_fmt *fmt;
tools/perf/util/auxtrace.c +5 -5
@@ -124,7 +124,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp, }void auxtrace_mmap_params__set_idx (struct auxtrace_mmap_params *mp, -struct perf_evlist *evlist,int idx, +struct evlist *evlist,int idx,bool per_cpu) { mp->idx = idx;
@@ -503,7 +503,7 @@ void auxtrace_heap__pop(struct auxtrace_heap *heap) }size_t auxtrace_record__info_priv_size (struct auxtrace_record *itr, -struct perf_evlist *evlist) +struct evlist *evlist) {if (itr)return itr->info_priv_size (itr, evlist);
@@ -556,7 +556,7 @@ int auxtrace_record__find_snapshot(struct auxtrace_record *itr, int idx, }int auxtrace_record__options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts) {if (itr)
@@ -585,7 +585,7 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr, }struct auxtrace_record *__weak -auxtrace_record__init (struct perf_evlist *evlist__maybe_unused ,int *err) +auxtrace_record__init (struct evlist *evlist__maybe_unused ,int *err) { *err =0 ;return NULL ;
@@ -2160,7 +2160,7 @@ static int perf_evsel__nr_addr_filter(struct evsel *evsel)return nr_addr_filters; } -int auxtrace_parse_filters (struct perf_evlist *evlist) +int auxtrace_parse_filters (struct evlist *evlist) {struct evsel *evsel;char *filter;
tools/perf/util/auxtrace.h +12 -12
@@ -23,7 +23,7 @@union perf_event ;struct perf_session ; -struct perf_evlist ; +struct evlist ;struct perf_tool ;struct perf_mmap ;struct option ;
@@ -309,10 +309,10 @@ struct auxtrace_mmap_params {*/ struct auxtrace_record {int (*recording_options)(struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts);size_t (*info_priv_size)(struct auxtrace_record *itr, -struct perf_evlist *evlist); +struct evlist *evlist); int (*info_fill)(struct auxtrace_record *itr, struct perf_session *session, struct auxtrace_info_event *auxtrace_info,
@@ -432,7 +432,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,unsigned int auxtrace_pages, bool auxtrace_overwrite);void auxtrace_mmap_params__set_idx (struct auxtrace_mmap_params *mp, -struct perf_evlist *evlist,int idx, +struct evlist *evlist,int idx,bool per_cpu); typedef int (*process_auxtrace_t)(struct perf_tool *tool,
@@ -482,17 +482,17 @@ int auxtrace_cache__add(struct auxtrace_cache *c, u32 key, struct auxtrace_cache_entry *entry);void *auxtrace_cache__lookup (struct auxtrace_cache *c,u32 key); -struct auxtrace_record *auxtrace_record__init (struct perf_evlist *evlist, +struct auxtrace_record *auxtrace_record__init (struct evlist *evlist,int *err);int auxtrace_parse_snapshot_options (struct auxtrace_record *itr,struct record_opts *opts,const char *str);int auxtrace_record__options (struct auxtrace_record *itr, -struct perf_evlist *evlist, +struct evlist *evlist,struct record_opts *opts);size_t auxtrace_record__info_priv_size (struct auxtrace_record *itr, -struct perf_evlist *evlist); +struct evlist *evlist); int auxtrace_record__info_fill(struct auxtrace_record *itr, struct perf_session *session, struct auxtrace_info_event *auxtrace_info,
@@ -540,7 +540,7 @@ void addr_filters__init(struct addr_filters *filts);void addr_filters__exit (struct addr_filters *filts);int addr_filters__parse_bare_filter (struct addr_filters *filts,const char *filter); -int auxtrace_parse_filters (struct perf_evlist *evlist); +int auxtrace_parse_filters (struct evlist *evlist); static inline int auxtrace__process_event(struct perf_session *session, union perf_event *event,
@@ -613,7 +613,7 @@ void itrace_synth_opts__clear_time_range(struct itrace_synth_opts *opts)#else static inline struct auxtrace_record * -auxtrace_record__init (struct perf_evlist *evlist__maybe_unused , +auxtrace_record__init (struct evlist *evlist__maybe_unused ,int *err) { *err =0 ;
@@ -636,7 +636,7 @@ perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr __maybe_unused,static inline int auxtrace_record__options (struct auxtrace_record *itr__maybe_unused , -struct perf_evlist *evlist__maybe_unused , +struct evlist *evlist__maybe_unused ,struct record_opts *opts__maybe_unused ) {return 0 ;
@@ -733,7 +733,7 @@ void auxtrace_index__free(struct list_head *head __maybe_unused) }static inline -int auxtrace_parse_filters (struct perf_evlist *evlist__maybe_unused ) +int auxtrace_parse_filters (struct evlist *evlist__maybe_unused ) {return 0 ; }
@@ -747,7 +747,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,unsigned int auxtrace_pages, bool auxtrace_overwrite);void auxtrace_mmap_params__set_idx (struct auxtrace_mmap_params *mp, -struct perf_evlist *evlist,int idx, +struct evlist *evlist,int idx,bool per_cpu);#define ITRACE_HELP ""
tools/perf/util/bpf-event.c +1 -1
@@ -418,7 +418,7 @@ static int bpf_event__sb_cb(union perf_event *event, void *data)return 0 ; } -int bpf_event__add_sb_event (struct perf_evlist **evlist, +int bpf_event__add_sb_event (struct evlist **evlist,struct perf_env *env) {struct perf_event_attr attr = {
tools/perf/util/bpf-event.h +2 -2
@@ -37,7 +37,7 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,perf_event__handler_t process, struct machine *machine, struct record_opts *opts); -int bpf_event__add_sb_event (struct perf_evlist **evlist, +int bpf_event__add_sb_event (struct evlist **evlist,struct perf_env *env); void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info, struct perf_env *env,
@@ -58,7 +58,7 @@ static inline int perf_event__synthesize_bpf_events(struct perf_session *sessionreturn 0 ; } -static inline int bpf_event__add_sb_event (struct perf_evlist **evlist__maybe_unused , +static inline int bpf_event__add_sb_event (struct evlist **evlist__maybe_unused ,struct perf_env *env__maybe_unused ) {return 0 ;
tools/perf/util/bpf-loader.c +10 -10
@@ -1043,7 +1043,7 @@ __bpf_map__config_value(struct bpf_map *map,static int bpf_map__config_value (struct bpf_map *map,struct parse_events_term *term, -struct perf_evlist *evlist__maybe_unused ) +struct evlist *evlist__maybe_unused ) {if (!term->err_val) {pr_debug ("Config value not set\n" );
@@ -1061,7 +1061,7 @@ bpf_map__config_value(struct bpf_map *map,static int __bpf_map__config_event (struct bpf_map *map,struct parse_events_term *term, -struct perf_evlist *evlist) +struct evlist *evlist) {struct evsel *evsel;const struct bpf_map_def *def;
@@ -1103,7 +1103,7 @@ __bpf_map__config_event(struct bpf_map *map,static int bpf_map__config_event (struct bpf_map *map,struct parse_events_term *term, -struct perf_evlist *evlist) +struct evlist *evlist) {if (!term->err_val) {pr_debug ("Config value not set\n" );
@@ -1121,7 +1121,7 @@ bpf_map__config_event(struct bpf_map *map,struct bpf_obj_config__map_func {const char *config_opt;int (*config_func)(struct bpf_map *,struct parse_events_term *, -struct perf_evlist *); +struct evlist *); };struct bpf_obj_config__map_func bpf_obj_config__map_funcs[] = {
@@ -1169,7 +1169,7 @@ config_map_indices_range_check(struct parse_events_term *term,static int bpf__obj_config_map (struct bpf_object *obj,struct parse_events_term *term, -struct perf_evlist *evlist, +struct evlist *evlist,int *key_scan_pos) {/* key is "map:<mapname>.<config opt>" */
@@ -1228,7 +1228,7 @@ bpf__obj_config_map(struct bpf_object *obj,int bpf__config_obj (struct bpf_object *obj,struct parse_events_term *term, -struct perf_evlist *evlist, +struct evlist *evlist,int *error_pos) {int key_scan_pos =0 ;
@@ -1523,7 +1523,7 @@ int bpf__apply_obj_config(void) (strcmp(name, \ bpf_map__name(pos)) == 0)) -struct evsel *bpf__setup_output_event (struct perf_evlist *evlist,const char *name) +struct evsel *bpf__setup_output_event (struct evlist *evlist,const char *name) {struct bpf_map_priv *tmpl_priv =NULL ;struct bpf_object *obj, *tmp;
@@ -1600,7 +1600,7 @@ struct evsel *bpf__setup_output_event(struct perf_evlist *evlist, const char *nareturn evsel; } -int bpf__setup_stdout (struct perf_evlist *evlist) +int bpf__setup_stdout (struct evlist *evlist) {struct evsel *evsel =bpf__setup_output_event (evlist,"__bpf_stdout__" );return PTR_ERR_OR_ZERO (evsel);
@@ -1756,7 +1756,7 @@ int bpf__strerror_load(struct bpf_object *obj,int bpf__strerror_config_obj (struct bpf_object *obj__maybe_unused ,struct parse_events_term *term__maybe_unused , -struct perf_evlist *evlist__maybe_unused , +struct evlist *evlist__maybe_unused ,int *error_pos__maybe_unused ,int err,char *buf,size_t size) {
@@ -1780,7 +1780,7 @@ int bpf__strerror_apply_obj_config(int err, char *buf, size_t size)return 0 ; } -int bpf__strerror_setup_output_event (struct perf_evlist *evlist__maybe_unused , +int bpf__strerror_setup_output_event (struct evlist *evlist__maybe_unused ,int err,char *buf,size_t size) {bpf__strerror_head (err, buf, size);
tools/perf/util/bpf-loader.h +12 -12
@@ -40,7 +40,7 @@ enum bpf_loader_errno { };struct evsel ; -struct perf_evlist ; +struct evlist ;struct bpf_object ;struct parse_events_term ;#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"
@@ -70,18 +70,18 @@ int bpf__foreach_event(struct bpf_object *obj, bpf_prog_iter_callback_t func, void *arg);int bpf__config_obj (struct bpf_object *obj,struct parse_events_term *term, -struct perf_evlist *evlist,int *error_pos); +struct evlist *evlist,int *error_pos);int bpf__strerror_config_obj (struct bpf_object *obj,struct parse_events_term *term, -struct perf_evlist *evlist, +struct evlist *evlist,int *error_pos,int err,char *buf,size_t size);int bpf__apply_obj_config (void );int bpf__strerror_apply_obj_config (int err,char *buf,size_t size); -int bpf__setup_stdout (struct perf_evlist *evlist); -struct evsel *bpf__setup_output_event (struct perf_evlist *evlist,const char *name); -int bpf__strerror_setup_output_event (struct perf_evlist *evlist,int err,char *buf,size_t size); +int bpf__setup_stdout (struct evlist *evlist); +struct evsel *bpf__setup_output_event (struct evlist *evlist,const char *name); +int bpf__strerror_setup_output_event (struct evlist *evlist,int err,char *buf,size_t size);#else #include <errno.h> #include <string.h>
@@ -119,7 +119,7 @@ bpf__foreach_event(struct bpf_object *obj __maybe_unused,static inline int bpf__config_obj (struct bpf_object *obj__maybe_unused ,struct parse_events_term *term__maybe_unused , -struct perf_evlist *evlist__maybe_unused , +struct evlist *evlist__maybe_unused ,int *error_pos__maybe_unused ) {return 0 ;
@@ -132,13 +132,13 @@ bpf__apply_obj_config(void) }static inline int -bpf__setup_stdout (struct perf_evlist *evlist__maybe_unused ) +bpf__setup_stdout (struct evlist *evlist__maybe_unused ) {return 0 ; }static inline struct evsel * -bpf__setup_output_event (struct perf_evlist *evlist__maybe_unused ,const char *name__maybe_unused ) +bpf__setup_output_event (struct evlist *evlist__maybe_unused ,const char *name__maybe_unused ) {return NULL ; }
@@ -182,7 +182,7 @@ static inline int bpf__strerror_load(struct bpf_object *obj __maybe_unused,static inline int bpf__strerror_config_obj (struct bpf_object *obj__maybe_unused ,struct parse_events_term *term__maybe_unused , -struct perf_evlist *evlist__maybe_unused , +struct evlist *evlist__maybe_unused ,int *error_pos__maybe_unused ,int err__maybe_unused ,char *buf,size_t size)
@@ -198,7 +198,7 @@ bpf__strerror_apply_obj_config(int err __maybe_unused, }static inline int -bpf__strerror_setup_output_event (struct perf_evlist *evlist__maybe_unused , +bpf__strerror_setup_output_event (struct evlist *evlist__maybe_unused ,int err__maybe_unused ,char *buf,size_t size) {return __bpf_strerror (buf, size);
@@ -206,7 +206,7 @@ bpf__strerror_setup_output_event(struct perf_evlist *evlist __maybe_unused,#endif -static inline int bpf__strerror_setup_stdout (struct perf_evlist *evlist,int err,char *buf,size_t size) +static inline int bpf__strerror_setup_stdout (struct evlist *evlist,int err,char *buf,size_t size) {return bpf__strerror_setup_output_event (evlist, err, buf, size); }
tools/perf/util/cgroup.c +5 -5
@@ -90,7 +90,7 @@ static int open_cgroup(const char *name)return fd; } -static struct cgroup *evlist__find_cgroup (struct perf_evlist *evlist,const char *str) +static struct cgroup *evlist__find_cgroup (struct evlist *evlist,const char *str) {struct evsel *counter;/*
@@ -130,14 +130,14 @@ static struct cgroup *cgroup__new(const char *name)return NULL ; } -struct cgroup *evlist__findnew_cgroup (struct perf_evlist *evlist,const char *name) +struct cgroup *evlist__findnew_cgroup (struct evlist *evlist,const char *name) {struct cgroup *cgroup =evlist__find_cgroup (evlist, name);return cgroup ?:cgroup__new (name); } -static int add_cgroup (struct perf_evlist *evlist,const char *str) +static int add_cgroup (struct evlist *evlist,const char *str) {struct evsel *counter;struct cgroup *cgrp =evlist__findnew_cgroup (evlist, str);
@@ -190,7 +190,7 @@ static void evsel__set_default_cgroup(struct evsel *evsel, struct cgroup *cgroup evsel->cgrp =cgroup__get (cgroup); } -void evlist__set_default_cgroup (struct perf_evlist *evlist,struct cgroup *cgroup) +void evlist__set_default_cgroup (struct evlist *evlist,struct cgroup *cgroup) {struct evsel *evsel;
@@ -201,7 +201,7 @@ void evlist__set_default_cgroup(struct perf_evlist *evlist, struct cgroup *cgrouint parse_cgroups (const struct option *opt,const char *str,int unset__maybe_unused ) { -struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; +struct evlist *evlist = *(struct evlist **)opt->value;struct evsel *counter;struct cgroup *cgrp =NULL ;const char *p, *e, *eos = str +strlen (str);
tools/perf/util/cgroup.h +3 -3
@@ -18,11 +18,11 @@ extern int nr_cgroups; /* number of explicit cgroups defined */struct cgroup *cgroup__get (struct cgroup *cgroup);void cgroup__put (struct cgroup *cgroup); -struct perf_evlist ; +struct evlist ; -struct cgroup *evlist__findnew_cgroup (struct perf_evlist *evlist,const char *name); +struct cgroup *evlist__findnew_cgroup (struct evlist *evlist,const char *name); -void evlist__set_default_cgroup (struct perf_evlist *evlist,struct cgroup *cgroup); +void evlist__set_default_cgroup (struct evlist *evlist,struct cgroup *cgroup);int parse_cgroups (const struct option *opt,const char *str,int unset);
tools/perf/util/cs-etm.c +2 -2
@@ -1222,7 +1222,7 @@ static int cs_etm__synth_event(struct perf_session *session,static int cs_etm__synth_events (struct cs_etm_auxtrace *etm,struct perf_session *session) { -struct perf_evlist *evlist = session->evlist; +struct evlist *evlist = session->evlist;struct evsel *evsel;struct perf_event_attr attr;bool found = false;
@@ -2295,7 +2295,7 @@ static int cs_etm__process_auxtrace_event(struct perf_session *session,static bool cs_etm__is_timeless_decoding (struct cs_etm_auxtrace *etm) {struct evsel *evsel; -struct perf_evlist *evlist = etm->session->evlist; +struct evlist *evlist = etm->session->evlist;bool timeless_decoding = true;/*
tools/perf/util/data-convert-bt.c +2 -2
@@ -1201,7 +1201,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)static int setup_events (struct ctf_writer *cw,struct perf_session *session) { -struct perf_evlist *evlist = session->evlist; +struct evlist *evlist = session->evlist;struct evsel *evsel;int ret;
@@ -1308,7 +1308,7 @@ static int setup_non_sample_events(struct ctf_writer *cw,static void cleanup_events (struct perf_session *session) { -struct perf_evlist *evlist = session->evlist; +struct evlist *evlist = session->evlist;struct evsel *evsel;evlist__for_each_entry (evlist, evsel) {
tools/perf/util/evlist.c +97 -97
744 lines not on this page · raw message
tools/perf/util/evlist.h +80 -80
293 lines not on this page · raw message
tools/perf/util/evsel.c +2 -2
@@ -3044,7 +3044,7 @@ struct perf_env *perf_evsel__env(struct evsel *evsel)return NULL ; } -static int store_evsel_ids (struct evsel *evsel,struct perf_evlist *evlist) +static int store_evsel_ids (struct evsel *evsel,struct evlist *evlist) {int cpu, thread;
@@ -3062,7 +3062,7 @@ static int store_evsel_ids(struct evsel *evsel, struct perf_evlist *evlist)return 0 ; } -int perf_evsel__store_ids (struct evsel *evsel,struct perf_evlist *evlist) +int perf_evsel__store_ids (struct evsel *evsel,struct evlist *evlist) {struct perf_cpu_map *cpus = evsel->cpus;struct perf_thread_map *threads = evsel->threads;
tools/perf/util/evsel.h +2 -2
@@ -102,7 +102,7 @@ struct bpf_object;*/ struct evsel {struct list_head node; -struct perf_evlist *evlist; +struct evlist *evlist;struct perf_event_attr attr;char *filter;struct xyarray *fd;
@@ -506,5 +506,5 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,struct perf_env *perf_evsel__env (struct evsel *evsel); -int perf_evsel__store_ids (struct evsel *evsel,struct perf_evlist *evlist); +int perf_evsel__store_ids (struct evsel *evsel,struct evlist *evlist);#endif /* __PERF_EVSEL_H */
tools/perf/util/header.c +43 -43
50 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0
Part of the diff is not shown here. View the raw message.
Arnaldo Carvalho de Melo
maintainerPATCH 33/107 perf evsel: Rename perf_evsel__init() to evsel__init()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__init() to evsel__init(), so we don't have a name clash when we add perf_evsel__init() in libperf.
--- tools/perf/util/evsel.c | 8 ++++---- tools/perf/util/evsel.h | 3 +-- tools/perf/util/python.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
tools/perf/util/evsel.c +4 -4
@@ -223,8 +223,8 @@ bool perf_evsel__is_function_event(struct evsel *evsel)#undef FUNCTION_EVENT } -void perf_evsel__init (struct evsel *evsel, -struct perf_event_attr *attr,int idx) +void evsel__init (struct evsel *evsel, +struct perf_event_attr *attr,int idx) { evsel->idx = idx; evsel->tracking = !idx;
@@ -255,7 +255,7 @@ struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)if (!evsel)return NULL ; -perf_evsel__init (evsel, attr, idx); +evsel__init (evsel, attr, idx);if (perf_evsel__is_bpf_output (evsel)) { evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
@@ -350,7 +350,7 @@ struct evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx)event_attr_init (&attr); attr.config = evsel->tp_format->id; attr.sample_period =1 ; -perf_evsel__init (evsel, &attr, idx); +evsel__init (evsel, &attr, idx); }return evsel;
tools/perf/util/evsel.h +1 -2
@@ -238,8 +238,7 @@ struct evsel *perf_evsel__new_cycles(bool precise);struct tep_event *event_format__new (const char *sys,const char *name); -void perf_evsel__init (struct evsel *evsel, -struct perf_event_attr *attr,int idx); +void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx);void perf_evsel__exit (struct evsel *evsel);void perf_evsel__delete (struct evsel *evsel);
tools/perf/util/python.c +1 -1
@@ -782,7 +782,7 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel, attr.sample_id_all = sample_id_all; attr.size =sizeof (attr); -perf_evsel__init (&pevsel->evsel, &attr, idx); +evsel__init (&pevsel->evsel, &attr, idx);return 0 ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 34/107 perf evlist: Rename perf_evlist__init() to evlist__init()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__init() to evlist__init(), so we don't have a name clash when we add perf_evlist__init() in libperf.
--- tools/perf/util/evlist.c | 6 +++--- tools/perf/util/evlist.h | 4 ++-- tools/perf/util/python.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/evlist.c +3 -3
@@ -41,8 +41,8 @@ int sigqueue(pid_t pid, int sig, const union sigval value);#define FD (e, x, y) (*(int *)xyarray__entry(e->fd, x, y))#define SID (e, x, y) xyarray__entry(e->sample_id, x, y) -void perf_evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus, -struct perf_thread_map *threads) +void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus, +struct perf_thread_map *threads) {int i;
@@ -60,7 +60,7 @@ struct evlist *perf_evlist__new(void)struct evlist *evlist =zalloc (sizeof (*evlist));if (evlist !=NULL ) -perf_evlist__init (evlist,NULL ,NULL ); +evlist__init (evlist,NULL ,NULL );return evlist; }
tools/perf/util/evlist.h +2 -2
@@ -68,8 +68,8 @@ struct evsel_str_handler {struct evlist *perf_evlist__new (void );struct evlist *perf_evlist__new_default (void );struct evlist *perf_evlist__new_dummy (void ); -void perf_evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus, -struct perf_thread_map *threads); +void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus, +struct perf_thread_map *threads);void perf_evlist__exit (struct evlist *evlist);void perf_evlist__delete (struct evlist *evlist);
tools/perf/util/python.c +1 -1
@@ -873,7 +873,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist, threads = ((struct pyrf_thread_map *)pthreads)->threads; cpus = ((struct pyrf_cpu_map *)pcpus)->cpus; -perf_evlist__init (&pevlist->evlist, cpus, threads); +evlist__init (&pevlist->evlist, cpus, threads);return 0 ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 35/107 perf evlist: Rename perf_evlist__new() to evlist__new()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__new() to evlist__new(), so we don't have a name clash when we add perf_evlist__new() in libperf.
--- tools/perf/arch/powerpc/util/kvm-stat.c | 2 +- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/backward-ring-buffer.c | 2 +- tools/perf/tests/bpf.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 ++-- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 2 +- tools/perf/tests/hists_link.c | 2 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/sw-clock.c | 4 ++-- tools/perf/tests/switch-tracking.c | 4 ++-- tools/perf/util/evlist.c | 8 ++++---- tools/perf/util/evlist.h | 2 +- tools/perf/util/header.c | 4 ++-- tools/perf/util/record.c | 4 ++-- 28 files changed, 36 insertions(+), 36 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +1 -1
@@ -146,7 +146,7 @@ static int ppc__setup_book3s_hv(struct perf_kvm_stat *kvm,/* Wrapper to setup kvm tracepoints */ static int ppc__setup_kvm_tp (struct perf_kvm_stat *kvm) { -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/arch/x86/tests/intel-cqm.c +1 -1
@@ -51,7 +51,7 @@ int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subt flag =perf_event_open_cloexec_flag (); - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) {pr_debug ("perf_evlist__new failed\n" );return TEST_FAIL ;
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -68,7 +68,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe cpus =cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); - evlist =perf_evlist__new (); + evlist =evlist__new ();CHECK_NOT_NULL__ (evlist);perf_evlist__set_maps (evlist, cpus, threads);
tools/perf/builtin-ftrace.c +1 -1
@@ -495,7 +495,7 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_filters; } - ftrace.evlist =perf_evlist__new (); + ftrace.evlist =evlist__new ();if (ftrace.evlist ==NULL ) { ret = -ENOMEM ; goto out_delete_filters;
tools/perf/builtin-kvm.c +1 -1
@@ -1290,7 +1290,7 @@ static struct evlist *kvm_live_event_list(void)int err =-1 ;const char *const *events_tp; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (evlist ==NULL )return NULL ;
tools/perf/builtin-record.c +1 -1
@@ -2265,7 +2265,7 @@ int cmd_record(int argc, const char **argv)CPU_ZERO (&rec->affinity_mask); rec->opts.affinity =PERF_AFFINITY_SYS ; - rec->evlist =perf_evlist__new (); + rec->evlist =evlist__new ();if (rec->evlist ==NULL )return -ENOMEM ;
tools/perf/builtin-stat.c +1 -1
@@ -1702,7 +1702,7 @@ int cmd_stat(int argc, const char **argv)setlocale (LC_ALL ,"" ); - evsel_list =perf_evlist__new (); + evsel_list =evlist__new ();if (evsel_list ==NULL )return -ENOMEM ;
tools/perf/builtin-top.c +1 -1
@@ -1524,7 +1524,7 @@ int cmd_top(int argc, const char **argv) top.annotation_opts.min_pcnt =5 ; top.annotation_opts.context =4 ; - top.evlist =perf_evlist__new (); + top.evlist =evlist__new ();if (top.evlist ==NULL )return -ENOMEM ;
tools/perf/builtin-trace.c +1 -1
@@ -4169,7 +4169,7 @@ int cmd_trace(int argc, const char **argv)signal (SIGSEGV , sighandler_dump_stack);signal (SIGFPE , sighandler_dump_stack); - trace.evlist =perf_evlist__new (); + trace.evlist =evlist__new (); trace.sctbl =syscalltbl__new ();if (trace.evlist ==NULL || trace.sctbl ==NULL ) {
tools/perf/tests/backward-ring-buffer.c +1 -1
@@ -99,7 +99,7 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m pid[sizeof (pid) -1 ] ='\0' ; opts.target.tid = opts.target.pid = pid; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) {pr_debug ("Not enough memory to create evlist\n" );return TEST_FAIL ;
tools/perf/tests/bpf.c +1 -1
@@ -140,7 +140,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void), opts.target.tid = opts.target.pid = pid;/* Instead of perf_evlist__new_default, don't add default events */ - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) {pr_debug ("Not enough memory to create evlist\n" );return TEST_FAIL ;
tools/perf/tests/code-reading.c +1 -1
@@ -622,7 +622,7 @@ static int do_test_code_reading(bool try_kcore)while (1 ) {const char *str; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) {pr_debug ("perf_evlist__new failed\n" ); goto out_put;
tools/perf/tests/event-times.c +1 -1
@@ -166,7 +166,7 @@ static int test_times(int (attach)(struct evlist *),struct evsel *evsel;int err =-1 , i; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) {pr_debug ("failed to create event list\n" ); goto out_err;
tools/perf/tests/evsel-roundtrip-name.c +2 -2
@@ -12,7 +12,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)char name[128 ];int type, op, err =0 , ret =0 , i, idx;struct evsel *evsel; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ;
@@ -68,7 +68,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) {int i, err;struct evsel *evsel; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/tests/hists_cumulate.c +1 -1
@@ -695,7 +695,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_ustruct machines machines;struct machine *machine;struct evsel *evsel; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();size_t i;test_fn_t testcases[] = { test1,
tools/perf/tests/hists_filter.c +1 -1
@@ -109,7 +109,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unustruct machines machines;struct machine *machine;struct evsel *evsel; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();TEST_ASSERT_VAL ("No memory" , evlist);
tools/perf/tests/hists_link.c +1 -1
@@ -272,7 +272,7 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unusestruct machines machines;struct machine *machine =NULL ;struct evsel *evsel, *first; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/tests/hists_output.c +1 -1
@@ -581,7 +581,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unustruct machines machines;struct machine *machine;struct evsel *evsel; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();size_t i;test_fn_t testcases[] = { test1,
tools/perf/tests/keep-tracking.c +1 -1
@@ -78,7 +78,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un cpus =cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); - evlist =perf_evlist__new (); + evlist =evlist__new ();CHECK_NOT_NULL__ (evlist);perf_evlist__set_maps (evlist, cpus, threads);
tools/perf/tests/mmap-basic.c +1 -1
@@ -61,7 +61,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse goto out_free_cpus; } - evlist =perf_evlist__new (); + evlist =evlist__new ();if (evlist ==NULL ) {pr_debug ("perf_evlist__new\n" ); goto out_free_cpus;
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -32,7 +32,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest };const char *filename ="/etc/passwd" ;int flags =O_RDONLY |O_DIRECTORY ; -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();struct evsel *evsel;int err =-1 , i, nr_events =0 , nr_polls =0 ;char sbuf[STRERR_BUFSIZE ];
tools/perf/tests/parse-events.c +1 -1
@@ -1777,7 +1777,7 @@ static int test_event(struct evlist_test *e)return 0 ; } - evlist =perf_evlist__new (); + evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ;
tools/perf/tests/sw-clock.c +2 -2
@@ -43,9 +43,9 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) attr.sample_freq =500 ; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (evlist ==NULL ) { -pr_debug ("perf_evlist__new\n" ); +pr_debug ("evlist__new\n" );return -1 ; }
tools/perf/tests/switch-tracking.c +2 -2
@@ -347,9 +347,9 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist) { -pr_debug ("perf_evlist__new failed!\n" ); +pr_debug ("evlist__new failed!\n" ); goto out_err; }
tools/perf/util/evlist.c +4 -4
@@ -55,7 +55,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, evlist->bkw_mmap_state =BKW_MMAP_NOTREADY ; } -struct evlist *perf_evlist__new (void ) +struct evlist *evlist__new (void ) {struct evlist *evlist =zalloc (sizeof (*evlist));
@@ -67,7 +67,7 @@ struct evlist *perf_evlist__new(void)struct evlist *perf_evlist__new_default (void ) { -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist &&perf_evlist__add_default (evlist)) {perf_evlist__delete (evlist);
@@ -79,7 +79,7 @@ struct evlist *perf_evlist__new_default(void)struct evlist *perf_evlist__new_dummy (void ) { -struct evlist *evlist =perf_evlist__new (); +struct evlist *evlist =evlist__new ();if (evlist &&perf_evlist__add_dummy (evlist)) {perf_evlist__delete (evlist);
@@ -1839,7 +1839,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist,bool new_evlist = (*evlist) ==NULL ;if (*evlist ==NULL ) - *evlist =perf_evlist__new (); + *evlist =evlist__new ();if (*evlist ==NULL )return -1 ;
tools/perf/util/evlist.h +1 -1
@@ -65,7 +65,7 @@ struct evsel_str_handler {void *handler; }; -struct evlist *perf_evlist__new (void ); +struct evlist *evlist__new (void );struct evlist *perf_evlist__new_default (void );struct evlist *perf_evlist__new_dummy (void ); void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,
tools/perf/util/header.c +2 -2
@@ -3535,7 +3535,7 @@ int perf_session__read_header(struct perf_session *session)int nr_attrs, nr_ids, i, j;int fd =perf_data__fd (data); - session->evlist =perf_evlist__new (); + session->evlist =evlist__new ();if (session->evlist ==NULL )return -ENOMEM ;
@@ -4016,7 +4016,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,struct evlist *evlist = *pevlist;if (evlist ==NULL ) { - *pevlist = evlist =perf_evlist__new (); + *pevlist = evlist =evlist__new ();if (evlist ==NULL )return -ENOMEM ; }
tools/perf/util/record.c +2 -2
@@ -19,7 +19,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, int cpu, const char *str)int err = -EAGAIN , fd;static pid_t pid =-1 ; - evlist =perf_evlist__new (); + evlist =evlist__new ();if (!evlist)return -ENOMEM ;
@@ -264,7 +264,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str)bool ret = false;pid_t pid =-1 ; - temp_evlist =perf_evlist__new (); + temp_evlist =evlist__new ();if (!temp_evlist)return false;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 36/107 perf evlist: Rename perf_evlist__delete() to evlist__delete()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__delete() to evlist__delete(), so we don't have a name clash when we add perf_evlist__delete() in libperf.
--- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/builtin-kvm.c | 4 ++-- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/backward-ring-buffer.c | 2 +- tools/perf/tests/bpf.c | 2 +- tools/perf/tests/code-reading.c | 4 ++-- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 ++-- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 2 +- tools/perf/tests/hists_link.c | 2 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/parse-no-sample-id-all.c | 2 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/util/data-convert-bt.c | 2 +- tools/perf/util/evlist.c | 12 ++++++------ tools/perf/util/evlist.h | 2 +- tools/perf/util/header.c | 4 ++-- tools/perf/util/parse-events.c | 2 +- tools/perf/util/record.c | 4 ++-- 32 files changed, 42 insertions(+), 42 deletions(-)
tools/perf/arch/x86/tests/intel-cqm.c +1 -1
@@ -124,6 +124,6 @@ int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subtkill (pid,SIGKILL );wait (NULL ); out: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -163,6 +163,6 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe err =0 ; out_err: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/builtin-ftrace.c +1 -1
@@ -508,7 +508,7 @@ int cmd_ftrace(int argc, const char **argv) ret =__cmd_ftrace (&ftrace, argc, argv); out_delete_evlist: -perf_evlist__delete (ftrace.evlist); +evlist__delete (ftrace.evlist); out_delete_filters:delete_filter_func (&ftrace.filters);
tools/perf/builtin-kvm.c +2 -2
@@ -1325,7 +1325,7 @@ static struct evlist *kvm_live_event_list(void) out:if (err) { -perf_evlist__delete (evlist); +evlist__delete (evlist); evlist =NULL ; }
@@ -1460,7 +1460,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, out:perf_session__delete (kvm->session); kvm->session =NULL ; -perf_evlist__delete (kvm->evlist); +evlist__delete (kvm->evlist);return err; }
tools/perf/builtin-record.c +1 -1
@@ -2449,7 +2449,7 @@ int cmd_record(int argc, const char **argv) err =__cmd_record (&record, argc, argv); out: -perf_evlist__delete (rec->evlist); +evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr);return err;
tools/perf/builtin-stat.c +1 -1
@@ -2015,7 +2015,7 @@ int cmd_stat(int argc, const char **argv)if (smi_cost && smi_reset)sysfs__write_int (FREEZE_ON_SMI_PATH ,0 ); -perf_evlist__delete (evsel_list); +evlist__delete (evsel_list);runtime_stat_delete (&stat_config);
tools/perf/builtin-top.c +1 -1
@@ -1661,7 +1661,7 @@ int cmd_top(int argc, const char **argv)perf_evlist__stop_sb_thread (sb_evlist); out_delete_evlist: -perf_evlist__delete (top.evlist); +evlist__delete (top.evlist);perf_session__delete (top.session);return status;
tools/perf/builtin-trace.c +1 -1
@@ -3498,7 +3498,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) out_delete_evlist:trace__symbols__exit (trace); -perf_evlist__delete (evlist); +evlist__delete (evlist);cgroup__put (trace->cgroup); trace->evlist =NULL ; trace->live = false;
tools/perf/tests/backward-ring-buffer.c +1 -1
@@ -150,6 +150,6 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m ret =TEST_OK ; out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist);return ret; }
tools/perf/tests/bpf.c +1 -1
@@ -200,7 +200,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void), ret =TEST_OK ; out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist);return ret; }
tools/perf/tests/code-reading.c +2 -2
@@ -658,7 +658,7 @@ static int do_test_code_reading(bool try_kcore)cpu_map__get (cpus);thread_map__get (threads);perf_evlist__set_maps (evlist,NULL ,NULL ); -perf_evlist__delete (evlist); +evlist__delete (evlist); evlist =NULL ;continue ; }
@@ -703,7 +703,7 @@ static int do_test_code_reading(bool try_kcore) out_err:if (evlist) { -perf_evlist__delete (evlist); +evlist__delete (evlist); }else {cpu_map__put (cpus);thread_map__put (threads);
tools/perf/tests/event-times.c +1 -1
@@ -204,7 +204,7 @@ static int test_times(int (attach)(struct evlist *), count.ena, count.run); out_err: -perf_evlist__delete (evlist); +evlist__delete (evlist);return !err ?TEST_OK :TEST_FAIL ; }
tools/perf/tests/evsel-roundtrip-name.c +2 -2
@@ -60,7 +60,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) } } -perf_evlist__delete (evlist); +evlist__delete (evlist);return ret; }
@@ -91,7 +91,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) } out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/tests/hists_cumulate.c +1 -1
@@ -731,7 +731,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_u out:/* tear down everything */ -perf_evlist__delete (evlist); +evlist__delete (evlist);machines__exit (&machines);return err;
tools/perf/tests/hists_filter.c +1 -1
@@ -321,7 +321,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu out:/* tear down everything */ -perf_evlist__delete (evlist); +evlist__delete (evlist);reset_output_field ();machines__exit (&machines);
tools/perf/tests/hists_link.c +1 -1
@@ -334,7 +334,7 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unuse out:/* tear down everything */ -perf_evlist__delete (evlist); +evlist__delete (evlist);reset_output_field ();machines__exit (&machines);
tools/perf/tests/hists_output.c +1 -1
@@ -618,7 +618,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unu out:/* tear down everything */ -perf_evlist__delete (evlist); +evlist__delete (evlist);machines__exit (&machines);return err;
tools/perf/tests/keep-tracking.c +1 -1
@@ -147,7 +147,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un out_err:if (evlist) {perf_evlist__disable (evlist); -perf_evlist__delete (evlist); +evlist__delete (evlist); }else {cpu_map__put (cpus);thread_map__put (threads);
tools/perf/tests/mmap-basic.c +1 -1
@@ -151,7 +151,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse } out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist); cpus =NULL ; threads =NULL ; out_free_cpus:
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -134,7 +134,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest out_ok: err =0 ; out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist); out:return err; }
tools/perf/tests/parse-events.c +1 -1
@@ -1790,7 +1790,7 @@ static int test_event(struct evlist_test *e) ret = e->check (evlist); } -perf_evlist__delete (evlist); +evlist__delete (evlist);return ret; }
tools/perf/tests/parse-no-sample-id-all.c +1 -1
@@ -46,7 +46,7 @@ static int process_events(union perf_event **events, size_t count)for (i =0 ; i < count && !err; i++) err =process_event (&evlist, events[i]); -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/tests/perf-record.c +1 -1
@@ -325,7 +325,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus ++errs; } out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist); out:return (err <0 || errs >0 ) ?-1 :0 ; }
tools/perf/tests/sw-clock.c +1 -1
@@ -128,7 +128,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)cpu_map__put (cpus);thread_map__put (threads); out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/tests/switch-tracking.c +1 -1
@@ -567,7 +567,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ out:if (evlist) {perf_evlist__disable (evlist); -perf_evlist__delete (evlist); +evlist__delete (evlist); }else {cpu_map__put (cpus);thread_map__put (threads);
tools/perf/tests/task-exit.c +1 -1
@@ -138,6 +138,6 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedcpu_map__put (cpus);thread_map__put (threads); out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
tools/perf/util/data-convert-bt.c +1 -1
@@ -1319,7 +1319,7 @@ static void cleanup_events(struct perf_session *session)zfree (&evsel->priv); } -perf_evlist__delete (evlist); +evlist__delete (evlist); session->evlist =NULL ; }
tools/perf/util/evlist.c +6 -6
@@ -70,7 +70,7 @@ struct evlist *perf_evlist__new_default(void)struct evlist *evlist =evlist__new ();if (evlist &&perf_evlist__add_default (evlist)) { -perf_evlist__delete (evlist); +evlist__delete (evlist); evlist =NULL ; }
@@ -82,7 +82,7 @@ struct evlist *perf_evlist__new_dummy(void)struct evlist *evlist =evlist__new ();if (evlist &&perf_evlist__add_dummy (evlist)) { -perf_evlist__delete (evlist); +evlist__delete (evlist); evlist =NULL ; }
@@ -134,7 +134,7 @@ void perf_evlist__exit(struct evlist *evlist)fdarray__exit (&evlist->pollfd); } -void perf_evlist__delete (struct evlist *evlist) +void evlist__delete (struct evlist *evlist) {if (evlist ==NULL )return ;
@@ -1859,7 +1859,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, out_err:if (new_evlist) { -perf_evlist__delete (*evlist); +evlist__delete (*evlist); *evlist =NULL ; }return -1 ;
@@ -1938,7 +1938,7 @@ int perf_evlist__start_sb_thread(struct evlist *evlist,return 0 ; out_delete_evlist: -perf_evlist__delete (evlist); +evlist__delete (evlist); evlist =NULL ;return -1 ; }
@@ -1949,5 +1949,5 @@ void perf_evlist__stop_sb_thread(struct evlist *evlist)return ; evlist->thread.done =1 ;pthread_join (evlist->thread.th,NULL ); -perf_evlist__delete (evlist); +evlist__delete (evlist); }
tools/perf/util/evlist.h +1 -1
@@ -71,7 +71,7 @@ struct evlist *perf_evlist__new_dummy(void);void evlist__init (struct evlist *evlist,struct perf_cpu_map *cpus,struct perf_thread_map *threads);void perf_evlist__exit (struct evlist *evlist); -void perf_evlist__delete (struct evlist *evlist); +void evlist__delete (struct evlist *evlist);void perf_evlist__add (struct evlist *evlist,struct evsel *entry);void perf_evlist__remove (struct evlist *evlist,struct evsel *evsel);
tools/perf/util/header.c +2 -2
@@ -3591,7 +3591,7 @@ int perf_session__read_header(struct perf_session *session) evsel->needs_swap = header->needs_swap;/* * Do it before so that if perf_evsel__alloc_id fails, this -* entry gets purged too at perf_evlist__delete(). +* entry gets purged too at evlist__delete(). */ perf_evlist__add (session->evlist, evsel);
@@ -3628,7 +3628,7 @@ int perf_session__read_header(struct perf_session *session)return -errno; out_delete_evlist: -perf_evlist__delete (session->evlist); +evlist__delete (session->evlist); session->evlist =NULL ;return -ENOMEM ; }
tools/perf/util/parse-events.c +1 -1
@@ -1935,7 +1935,7 @@ int parse_events(struct evlist *evlist, const char *str,/* * There are 2 users - builtin-record and builtin-test objects. -* Both call perf_evlist__delete in case of error, so we dont +* Both call evlist__delete in case of error, so we dont * need to bother. */ return ret;
tools/perf/util/record.c +2 -2
@@ -53,7 +53,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, int cpu, const char *str) err =0 ; out_delete: -perf_evlist__delete (evlist); +evlist__delete (evlist);return err; }
@@ -299,7 +299,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str) ret = true; out_delete: -perf_evlist__delete (temp_evlist); +evlist__delete (temp_evlist);return ret; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 37/107 perf evsel: Rename perf_evsel__delete() to evsel__delete()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Remame perf_evsel__delete() to evsel__delete(), so we don't have a name clash when we add perf_evsel__delete() in libperf.
Also renaming perf_evsel__delete_priv() to evsel__delete_priv().
--- tools/perf/builtin-inject.c | 4 ++-- tools/perf/builtin-trace.c | 12 ++++++------ tools/perf/tests/evsel-tp-sched.c | 4 ++-- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/openat-syscall.c | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evsel.c | 4 ++-- tools/perf/util/evsel.h | 2 +- tools/perf/util/parse-events.c | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-)
tools/perf/builtin-inject.c +2 -2
@@ -623,7 +623,7 @@ static void strip_fini(struct perf_inject *inject) ok_to_remove(evlist, evsel)) {pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel));perf_evlist__remove (evlist, evsel); -perf_evsel__delete (evsel); +evsel__delete (evsel); } } }
@@ -725,7 +725,7 @@ static int __cmd_inject(struct perf_inject *inject)pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel));perf_evlist__remove (session->evlist, evsel); -perf_evsel__delete (evsel); +evsel__delete (evsel); }if (inject->strip)strip_fini (inject);
tools/perf/builtin-trace.c +6 -6
@@ -274,10 +274,10 @@ static int perf_evsel__init_tp_ptr_field(struct evsel *evsel, ({ struct syscall_tp *sc = evsel->priv;\ perf_evsel__init_tp_ptr_field(evsel, &sc->name, #name); }) -static void perf_evsel__delete_priv(struct evsel *evsel) +static void evsel__delete_priv(struct evsel *evsel) { zfree(&evsel->priv); - perf_evsel__delete(evsel); + evsel__delete(evsel); } static int perf_evsel__init_syscall_tp(struct evsel *evsel)
@@ -368,7 +368,7 @@ static struct evsel *perf_evsel__raw_syscall_newtp(const char *direction, void *return evsel; out_delete: -perf_evsel__delete_priv (evsel); +evsel__delete_priv (evsel);return NULL ; }
@@ -2638,7 +2638,7 @@ static bool perf_evlist__add_vfs_getname(struct evlist *evlist)list_del_init (&evsel->node); evsel->evlist =NULL ; -perf_evsel__delete (evsel); +evsel__delete (evsel); }return found;
@@ -2739,9 +2739,9 @@ static int trace__add_syscall_newtp(struct trace *trace)return ret; out_delete_sys_exit: -perf_evsel__delete_priv (sys_exit); +evsel__delete_priv (sys_exit); out_delete_sys_enter: -perf_evsel__delete_priv (sys_enter); +evsel__delete_priv (sys_enter); goto out; }
tools/perf/tests/evsel-tp-sched.c +2 -2
@@ -64,7 +64,7 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtesif (perf_evsel__test_field (evsel,"next_prio" ,4 , true)) ret =-1 ; -perf_evsel__delete (evsel); +evsel__delete (evsel); evsel =perf_evsel__newtp ("sched" ,"sched_wakeup" );
@@ -85,6 +85,6 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtesif (perf_evsel__test_field (evsel,"target_cpu" ,4 , true)) ret =-1 ; -perf_evsel__delete (evsel); +evsel__delete (evsel);return ret; }
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -118,7 +118,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int out_close_fd:perf_evsel__close_fd (evsel); out_evsel_delete: -perf_evsel__delete (evsel); +evsel__delete (evsel); out_cpu_map_delete:cpu_map__put (cpus); out_thread_map_delete:
tools/perf/tests/openat-syscall.c +1 -1
@@ -59,7 +59,7 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __m out_close_fd:perf_evsel__close_fd (evsel); out_evsel_delete: -perf_evsel__delete (evsel); +evsel__delete (evsel); out_thread_map_delete:thread_map__put (threads);return err;
tools/perf/util/evlist.c +2 -2
@@ -121,7 +121,7 @@ static void perf_evlist__purge(struct evlist *evlist)evlist__for_each_entry_safe (evlist, n, pos) {list_del_init (&pos->node); pos->evlist =NULL ; -perf_evsel__delete (pos); +evsel__delete (pos); } evlist->nr_entries =0 ;
@@ -277,7 +277,7 @@ static int perf_evlist__add_attrs(struct evlist *evlist, out_delete_partial_list:__evlist__for_each_entry_safe (&head, n, evsel) -perf_evsel__delete (evsel); +evsel__delete (evsel);return -1 ; }
tools/perf/util/evsel.c +2 -2
@@ -316,7 +316,7 @@ struct evsel *perf_evsel__new_cycles(bool precise) out:return evsel; error_free: -perf_evsel__delete (evsel); +evsel__delete (evsel); evsel =NULL ; goto out; }
@@ -1333,7 +1333,7 @@ void perf_evsel__exit(struct evsel *evsel) perf_evsel__object.fini (evsel); } -void perf_evsel__delete (struct evsel *evsel) +void evsel__delete (struct evsel *evsel) {perf_evsel__exit (evsel);free (evsel);
tools/perf/util/evsel.h +1 -1
@@ -240,7 +240,7 @@ struct tep_event *event_format__new(const char *sys, const char *name);void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx);void perf_evsel__exit (struct evsel *evsel); -void perf_evsel__delete (struct evsel *evsel); +void evsel__delete (struct evsel *evsel);struct callchain_param ;
tools/perf/util/parse-events.c +2 -2
@@ -662,7 +662,7 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bp group, event);list_for_each_entry_safe (evsel, tmp, &new_evsels, node) {list_del_init (&evsel->node); -perf_evsel__delete (evsel); +evsel__delete (evsel); }return err; }
@@ -2334,7 +2334,7 @@ static bool is_event_supported(u8 type, unsigned config) evsel->attr.exclude_kernel =1 ; ret =perf_evsel__open (evsel,NULL , tmap) >=0 ; } -perf_evsel__delete (evsel); +evsel__delete (evsel); }thread_map__put (tmap);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 38/107 perf evsel: Rename perf_evsel__new() to evsel__new()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__new() to evsel__new(), so we don't have a name clash when we add perf_evsel__new() in libperf.
--- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 2 +- tools/perf/util/header.c | 4 ++-- tools/perf/util/parse-events.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/builtin-trace.c +1 -1
@@ -2657,7 +2657,7 @@ static struct evsel *perf_evsel__new_pgfault(u64 config)event_attr_init (&attr); - evsel =perf_evsel__new (&attr); + evsel =evsel__new (&attr);if (evsel) evsel->handler = trace__pgfault;
tools/perf/tests/sw-clock.c +1 -1
@@ -49,7 +49,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)return -1 ; } - evsel =perf_evsel__new (&attr); + evsel =evsel__new (&attr);if (evsel ==NULL ) {pr_debug ("perf_evsel__new\n" ); goto out_delete_evlist;
tools/perf/util/evsel.c +1 -1
@@ -301,7 +301,7 @@ struct evsel *perf_evsel__new_cycles(bool precise)* to kick in when we return and before perf_evsel__open() is called. */ new_event: - evsel =perf_evsel__new (&attr); + evsel =evsel__new (&attr);if (evsel ==NULL ) goto out;
tools/perf/util/evsel.h +1 -1
@@ -219,7 +219,7 @@ int perf_evsel__object_config(size_t object_size,struct evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); -static inline struct evsel *perf_evsel__new (struct perf_event_attr *attr) +static inline struct evsel *evsel__new (struct perf_event_attr *attr) {return perf_evsel__new_idx (attr,0 ); }
tools/perf/util/header.c +2 -2
@@ -3583,7 +3583,7 @@ int perf_session__read_header(struct perf_session *session) } tmp =lseek (fd,0 ,SEEK_CUR ); - evsel =perf_evsel__new (&f_attr.attr); + evsel =evsel__new (&f_attr.attr);if (evsel ==NULL ) goto out_delete_evlist;
@@ -4021,7 +4021,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,return -ENOMEM ; } - evsel =perf_evsel__new (&event->attr.attr); + evsel =evsel__new (&event->attr.attr);if (evsel ==NULL )return -ENOMEM ;
tools/perf/util/parse-events.c +1 -1
@@ -2318,7 +2318,7 @@ static bool is_event_supported(u8 type, unsigned config)if (tmap ==NULL )return false; - evsel =perf_evsel__new (&attr); + evsel =evsel__new (&attr);if (evsel) { open_return =perf_evsel__open (evsel,NULL , tmap); ret = open_return >=0 ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 39/107 perf evlist: Rename perf_evlist__add() to evlist__add()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__add() to evlist__add(), so we don't have a name clash when we add perf_evlist__add() in libperf.
--- tools/perf/builtin-trace.c | 12 ++++++------ tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/util/evlist.c | 16 ++++++++-------- tools/perf/util/evlist.h | 2 +- tools/perf/util/header.c | 4 ++-- tools/perf/util/python.c | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-)
tools/perf/builtin-trace.c +6 -6
@@ -2616,7 +2616,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)static size_t trace__fprintf_thread_summary (struct trace *trace,FILE *fp); -static bool perf_evlist__add_vfs_getname (struct evlist *evlist) +static bool evlist__add_vfs_getname (struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp;
@@ -2719,8 +2719,8 @@ static int trace__add_syscall_newtp(struct trace *trace)perf_evsel__config_callchain (sys_enter, &trace->opts, &callchain_param);perf_evsel__config_callchain (sys_exit, &trace->opts, &callchain_param); -perf_evlist__add (evlist, sys_enter); -perf_evlist__add (evlist, sys_exit); +evlist__add (evlist, sys_enter); +evlist__add (evlist, sys_exit);if (callchain_param.enabled && !trace->kernel_syscallchains) {/*
@@ -3264,7 +3264,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_error_raw_syscalls;if (trace->trace_syscalls) - trace->vfs_getname =perf_evlist__add_vfs_getname (evlist); + trace->vfs_getname =evlist__add_vfs_getname (evlist); }if ((trace->trace_pgfaults &TRACE_PFMAJ )) {
@@ -3272,7 +3272,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (pgfault_maj ==NULL ) goto out_error_mem;perf_evsel__config_callchain (pgfault_maj, &trace->opts, &callchain_param); -perf_evlist__add (evlist, pgfault_maj); +evlist__add (evlist, pgfault_maj); }if ((trace->trace_pgfaults &TRACE_PFMIN )) {
@@ -3280,7 +3280,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (pgfault_min ==NULL ) goto out_error_mem;perf_evsel__config_callchain (pgfault_min, &trace->opts, &callchain_param); -perf_evlist__add (evlist, pgfault_min); +evlist__add (evlist, pgfault_min); } if (trace->sched &&
tools/perf/tests/mmap-basic.c +1 -1
@@ -82,7 +82,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse evsels[i]->attr.wakeup_events =1 ;perf_evsel__set_sample_id (evsels[i], false); -perf_evlist__add (evlist, evsels[i]); +evlist__add (evlist, evsels[i]);if (perf_evsel__open (evsels[i], cpus, threads) <0 ) { pr_debug("failed to open counter: %s, "
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -48,7 +48,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest goto out_delete_evlist; } -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel); err =perf_evlist__create_maps (evlist, &opts.target);if (err <0 ) {
tools/perf/tests/sw-clock.c +1 -1
@@ -54,7 +54,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)pr_debug ("perf_evsel__new\n" ); goto out_delete_evlist; } -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel); cpus =cpu_map__dummy_new (); threads =thread_map__new_by_tid (getpid ());
tools/perf/util/evlist.c +8 -8
@@ -177,7 +177,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)__perf_evlist__propagate_maps (evlist, evsel); } -void perf_evlist__add (struct evlist *evlist,struct evsel *entry) +void evlist__add (struct evlist *evlist,struct evsel *entry) { entry->evlist = evlist;list_add_tail (&entry->node, &evlist->entries);
@@ -204,7 +204,7 @@ void perf_evlist__splice_list_tail(struct evlist *evlist,__evlist__for_each_entry_safe (list, temp, evsel) {list_del_init (&evsel->node); -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel); } }
@@ -237,7 +237,7 @@ int __perf_evlist__add_default(struct evlist *evlist, bool precise)if (evsel ==NULL )return -ENOMEM ; -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel);return 0 ; }
@@ -253,11 +253,11 @@ int perf_evlist__add_dummy(struct evlist *evlist)if (evsel ==NULL )return -ENOMEM ; -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel);return 0 ; } -static int perf_evlist__add_attrs (struct evlist *evlist, +static int evlist__add_attrs (struct evlist *evlist,struct perf_event_attr *attrs,size_t nr_attrs) {struct evsel *evsel, *n;
@@ -289,7 +289,7 @@ int __perf_evlist__add_default_attrs(struct evlist *evlist,for (i =0 ; i < nr_attrs; i++)event_attr_init (attrs + i); -return perf_evlist__add_attrs (evlist, attrs, nr_attrs); +return evlist__add_attrs (evlist, attrs, nr_attrs); } struct evsel *
@@ -330,7 +330,7 @@ int perf_evlist__add_newtp(struct evlist *evlist,return -1 ; evsel->handler = handler; -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel);return 0 ; }
@@ -1854,7 +1854,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, evsel->side_band.cb = cb; evsel->side_band.data = data; -perf_evlist__add (*evlist, evsel); +evlist__add (*evlist, evsel);return 0 ; out_err:
tools/perf/util/evlist.h +1 -1
@@ -73,7 +73,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,void perf_evlist__exit (struct evlist *evlist);void evlist__delete (struct evlist *evlist); -void perf_evlist__add (struct evlist *evlist,struct evsel *entry); +void evlist__add (struct evlist *evlist,struct evsel *entry);void perf_evlist__remove (struct evlist *evlist,struct evsel *evsel);int __perf_evlist__add_default (struct evlist *evlist,bool precise);
tools/perf/util/header.c +2 -2
@@ -3593,7 +3593,7 @@ int perf_session__read_header(struct perf_session *session)* Do it before so that if perf_evsel__alloc_id fails, this * entry gets purged too at evlist__delete(). */ -perf_evlist__add (session->evlist, evsel); +evlist__add (session->evlist, evsel); nr_ids = f_attr.ids.size /sizeof (u64);/*
@@ -4025,7 +4025,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,if (evsel ==NULL )return -ENOMEM ; -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel); ids = event->header.size; ids -= (void *)&event->attr.id - (void *)event;
tools/perf/util/python.c +1 -1
@@ -974,7 +974,7 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,Py_INCREF (pevsel); evsel = &((struct pyrf_evsel *)pevsel)->evsel; evsel->idx = evlist->nr_entries; -perf_evlist__add (evlist, evsel); +evlist__add (evlist, evsel);return Py_BuildValue ("i" , evlist->nr_entries); }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 40/107 perf evlist: Rename perf_evlist__remove() to evlist__remove()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__remove() to evlist__remove(), so we don't have a name clash when we add perf_evlist__remove() in libperf.
--- tools/perf/builtin-inject.c | 4 ++-- tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
tools/perf/builtin-inject.c +2 -2
@@ -622,7 +622,7 @@ static void strip_fini(struct perf_inject *inject)if (evsel->handler == drop_sample &&ok_to_remove (evlist, evsel)) {pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -perf_evlist__remove (evlist, evsel); +evlist__remove (evlist, evsel);evsel__delete (evsel); } }
@@ -724,7 +724,7 @@ static int __cmd_inject(struct perf_inject *inject)if (evsel) {pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -perf_evlist__remove (session->evlist, evsel); +evlist__remove (session->evlist, evsel);evsel__delete (evsel); }if (inject->strip)
tools/perf/util/evlist.c +1 -1
@@ -190,7 +190,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)__perf_evlist__propagate_maps (evlist, entry); } -void perf_evlist__remove (struct evlist *evlist,struct evsel *evsel) +void evlist__remove (struct evlist *evlist,struct evsel *evsel) { evsel->evlist =NULL ;list_del_init (&evsel->node);
tools/perf/util/evlist.h +1 -1
@@ -74,7 +74,7 @@ void perf_evlist__exit(struct evlist *evlist);void evlist__delete (struct evlist *evlist);void evlist__add (struct evlist *evlist,struct evsel *entry); -void perf_evlist__remove (struct evlist *evlist,struct evsel *evsel); +void evlist__remove (struct evlist *evlist,struct evsel *evsel);int __perf_evlist__add_default (struct evlist *evlist,bool precise);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 41/107 perf evsel: Rename perf_evsel__open() to evsel__open()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__open() to evsel__open(), so we don't have a name clash when we add perf_evsel__open() in libperf.
--- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evsel.c | 8 ++++---- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/parse-events.c | 4 ++-- tools/perf/util/python.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-)
tools/perf/builtin-record.c +1 -1
@@ -739,7 +739,7 @@ static int record__open(struct record *rec)evlist__for_each_entry (evlist, pos) { try_again: -if (perf_evsel__open (pos, pos->cpus, pos->threads) <0 ) { +if (evsel__open (pos, pos->cpus, pos->threads) <0 ) {if (perf_evsel__fallback (pos, errno, msg,sizeof (msg))) {if (verbose >0 )ui__warning ("%s\n" , msg);
tools/perf/builtin-top.c +1 -1
@@ -989,7 +989,7 @@ static int perf_top__start_counters(struct perf_top *top)evlist__for_each_entry (evlist, counter) { try_again: -if (perf_evsel__open (counter, top->evlist->cpus, +if (evsel__open (counter, top->evlist->cpus, top->evlist->threads) <0 ) {/*
tools/perf/tests/mmap-basic.c +1 -1
@@ -84,7 +84,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuseevlist__add (evlist, evsels[i]); -if (perf_evsel__open (evsels[i], cpus, threads) <0 ) { +if (evsel__open (evsels[i], cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -48,7 +48,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int goto out_cpu_map_delete; } -if (perf_evsel__open (evsel, cpus, threads) <0 ) { +if (evsel__open (evsel, cpus, threads) <0 ) {pr_debug ("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/util/evlist.c +2 -2
@@ -1405,7 +1405,7 @@ int perf_evlist__open(struct evlist *evlist)perf_evlist__update_id_pos (evlist);evlist__for_each_entry (evlist, evsel) { - err =perf_evsel__open (evsel, evsel->cpus, evsel->threads); + err =evsel__open (evsel, evsel->cpus, evsel->threads);if (err <0 ) goto out_err; }
@@ -1918,7 +1918,7 @@ int perf_evlist__start_sb_thread(struct evlist *evlist, goto out_delete_evlist;evlist__for_each_entry (evlist, counter) { -if (perf_evsel__open (counter, evlist->cpus, +if (evsel__open (counter, evlist->cpus, evlist->threads) <0 ) goto out_delete_evlist; }
tools/perf/util/evsel.c +4 -4
@@ -1825,8 +1825,8 @@ static int perf_event_open(struct evsel *evsel,return fd; } -int perf_evsel__open (struct evsel *evsel,struct perf_cpu_map *cpus, -struct perf_thread_map *threads) +int evsel__open (struct evsel *evsel,struct perf_cpu_map *cpus, +struct perf_thread_map *threads) {int cpu, thread, nthreads;unsigned long flags =PERF_FLAG_FD_CLOEXEC ;
@@ -2086,13 +2086,13 @@ void perf_evsel__close(struct evsel *evsel)int perf_evsel__open_per_cpu (struct evsel *evsel,struct perf_cpu_map *cpus) { -return perf_evsel__open (evsel, cpus,NULL ); +return evsel__open (evsel, cpus,NULL ); }int perf_evsel__open_per_thread (struct evsel *evsel,struct perf_thread_map *threads) { -return perf_evsel__open (evsel,NULL , threads); +return evsel__open (evsel,NULL , threads); } static int perf_evsel__parse_id_sample(const struct evsel *evsel,
tools/perf/util/evsel.h +2 -2
@@ -302,8 +302,8 @@ int perf_evsel__open_per_cpu(struct evsel *evsel, struct perf_cpu_map *cpus);int perf_evsel__open_per_thread (struct evsel *evsel,struct perf_thread_map *threads); -int perf_evsel__open (struct evsel *evsel,struct perf_cpu_map *cpus, -struct perf_thread_map *threads); +int evsel__open (struct evsel *evsel,struct perf_cpu_map *cpus, +struct perf_thread_map *threads);void perf_evsel__close (struct evsel *evsel);struct perf_sample ;
tools/perf/util/parse-events.c +2 -2
@@ -2320,7 +2320,7 @@ static bool is_event_supported(u8 type, unsigned config) evsel =evsel__new (&attr);if (evsel) { - open_return =perf_evsel__open (evsel,NULL , tmap); + open_return =evsel__open (evsel,NULL , tmap); ret = open_return >=0 ;if (open_return == -EACCES ) {
@@ -2332,7 +2332,7 @@ static bool is_event_supported(u8 type, unsigned config)* */ evsel->attr.exclude_kernel =1 ; - ret =perf_evsel__open (evsel,NULL , tmap) >=0 ; + ret =evsel__open (evsel,NULL , tmap) >=0 ; }evsel__delete (evsel); }
tools/perf/util/python.c +1 -1
@@ -817,7 +817,7 @@ static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel,* This will group just the fds for this single evsel, to group * multiple events, use evlist.open(). */ -if (perf_evsel__open (evsel, cpus, threads) <0 ) { +if (evsel__open (evsel, cpus, threads) <0 ) {PyErr_SetFromErrno (PyExc_OSError);return NULL ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 42/107 perf evsel: Rename perf_evsel__enable() to evsel__enable()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__enable() to evsel__enable(), so we don't have a name clash when we add perf_evsel__enable() in libperf.
--- tools/perf/arch/arm/util/cs-etm.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 2 +- tools/perf/tests/event-times.c | 6 +++--- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +1 -1
@@ -834,7 +834,7 @@ static int cs_etm_snapshot_finish(struct auxtrace_record *itr)evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->cs_etm_pmu->type) -return perf_evsel__enable (evsel); +return evsel__enable (evsel); }return -EINVAL ; }
tools/perf/arch/x86/util/intel-bts.c +1 -1
@@ -330,7 +330,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr)evlist__for_each_entry (btsr->evlist, evsel) {if (evsel->attr.type == btsr->intel_bts_pmu->type) -return perf_evsel__enable (evsel); +return evsel__enable (evsel); }return -EINVAL ; }
tools/perf/arch/x86/util/intel-pt.c +1 -1
@@ -801,7 +801,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr)evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->intel_pt_pmu->type) -return perf_evsel__enable (evsel); +return evsel__enable (evsel); }return -EINVAL ; }
tools/perf/tests/event-times.c +3 -3
@@ -77,7 +77,7 @@ static int attach__current_disabled(struct evlist *evlist) }thread_map__put (threads); -return perf_evsel__enable (evsel) ==0 ?TEST_OK :TEST_FAIL ; +return evsel__enable (evsel) ==0 ?TEST_OK :TEST_FAIL ; }static int attach__current_enabled (struct evlist *evlist)
@@ -104,7 +104,7 @@ static int detach__disable(struct evlist *evlist) {struct evsel *evsel =perf_evlist__last (evlist); -return perf_evsel__enable (evsel); +return evsel__enable (evsel); }static int attach__cpu_disabled (struct evlist *evlist)
@@ -133,7 +133,7 @@ static int attach__cpu_disabled(struct evlist *evlist) }cpu_map__put (cpus); -return perf_evsel__enable (evsel); +return evsel__enable (evsel); }static int attach__cpu_enabled (struct evlist *evlist)
tools/perf/tests/switch-tracking.c +1 -1
@@ -509,7 +509,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } - err =perf_evsel__enable (cycles_evsel); + err =evsel__enable (cycles_evsel);if (err) {pr_debug ("perf_evlist__disable_event failed!\n" ); goto out_err;
tools/perf/util/evlist.c +2 -2
@@ -363,7 +363,7 @@ void perf_evlist__enable(struct evlist *evlist)evlist__for_each_entry (evlist, pos) {if (!perf_evsel__is_group_leader (pos) || !pos->fd)continue ; -perf_evsel__enable (pos); +evsel__enable (pos); } evlist->enabled = true;
@@ -1927,7 +1927,7 @@ int perf_evlist__start_sb_thread(struct evlist *evlist, goto out_delete_evlist;evlist__for_each_entry (evlist, counter) { -if (perf_evsel__enable (counter)) +if (evsel__enable (counter)) goto out_delete_evlist; }
tools/perf/util/evsel.c +1 -1
@@ -1234,7 +1234,7 @@ int perf_evsel__append_addr_filter(struct evsel *evsel, const char *filter)return perf_evsel__append_filter (evsel,"%s,%s" , filter); } -int perf_evsel__enable (struct evsel *evsel) +int evsel__enable (struct evsel *evsel) {int err =perf_evsel__run_ioctl (evsel,PERF_EVENT_IOC_ENABLE ,0 );
tools/perf/util/evsel.h +1 -1
@@ -295,7 +295,7 @@ int perf_evsel__append_tp_filter(struct evsel *evsel, const char *filter);int perf_evsel__append_addr_filter (struct evsel *evsel,const char *filter);int perf_evsel__apply_filter (struct evsel *evsel,const char *filter); -int perf_evsel__enable (struct evsel *evsel); +int evsel__enable (struct evsel *evsel);int perf_evsel__disable (struct evsel *evsel); int perf_evsel__open_per_cpu(struct evsel *evsel,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 43/107 perf evsel: Rename perf_evsel__disable() to evsel__disable()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Renaming perf_evsel__disable() to evsel__disable(), so we don't have a name clash when we add perf_evsel__disable() in libperf.
--- tools/perf/arch/arm/util/cs-etm.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/switch-tracking.c | 4 ++-- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +1 -1
@@ -821,7 +821,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr)evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->cs_etm_pmu->type) -return perf_evsel__disable (evsel); +return evsel__disable (evsel); }return -EINVAL ; }
tools/perf/arch/x86/util/intel-bts.c +1 -1
@@ -317,7 +317,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)evlist__for_each_entry (btsr->evlist, evsel) {if (evsel->attr.type == btsr->intel_bts_pmu->type) -return perf_evsel__disable (evsel); +return evsel__disable (evsel); }return -EINVAL ; }
tools/perf/arch/x86/util/intel-pt.c +1 -1
@@ -788,7 +788,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)evlist__for_each_entry (ptr->evlist, evsel) {if (evsel->attr.type == ptr->intel_pt_pmu->type) -return perf_evsel__disable (evsel); +return evsel__disable (evsel); }return -EINVAL ; }
tools/perf/builtin-trace.c +1 -1
@@ -2400,7 +2400,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel, ++trace->nr_events_printed;if (evsel->max_events !=ULONG_MAX && ++evsel->nr_events_printed == evsel->max_events) { -perf_evsel__disable (evsel); +evsel__disable (evsel);perf_evsel__close (evsel); } }
tools/perf/tests/keep-tracking.c +1 -1
@@ -129,7 +129,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un evsel =perf_evlist__last (evlist); -CHECK__ (perf_evsel__disable (evsel)); +CHECK__ (evsel__disable (evsel)); comm ="Test COMM 2" ;CHECK__ (prctl (PR_SET_NAME , (unsigned long )comm,0 ,0 ,0 ));
tools/perf/tests/switch-tracking.c +2 -2
@@ -464,7 +464,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_perf_evlist__enable (evlist); - err =perf_evsel__disable (cpu_clocks_evsel); + err =evsel__disable (cpu_clocks_evsel);if (err) {pr_debug ("perf_evlist__disable_event failed!\n" ); goto out_err;
@@ -483,7 +483,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } - err =perf_evsel__disable (cycles_evsel); + err =evsel__disable (cycles_evsel);if (err) {pr_debug ("perf_evlist__disable_event failed!\n" ); goto out_err;
tools/perf/util/evlist.c +1 -1
@@ -350,7 +350,7 @@ void perf_evlist__disable(struct evlist *evlist)evlist__for_each_entry (evlist, pos) {if (pos->disabled || !perf_evsel__is_group_leader (pos) || !pos->fd)continue ; -perf_evsel__disable (pos); +evsel__disable (pos); } evlist->enabled = false;
tools/perf/util/evsel.c +1 -1
@@ -1244,7 +1244,7 @@ int evsel__enable(struct evsel *evsel)return err; } -int perf_evsel__disable (struct evsel *evsel) +int evsel__disable (struct evsel *evsel) {int err =perf_evsel__run_ioctl (evsel,PERF_EVENT_IOC_DISABLE ,0 );/*
tools/perf/util/evsel.h +1 -1
@@ -296,7 +296,7 @@ int perf_evsel__append_addr_filter(struct evsel *evsel, const char *filter);int perf_evsel__apply_filter (struct evsel *evsel,const char *filter);int evsel__enable (struct evsel *evsel); -int perf_evsel__disable (struct evsel *evsel); +int evsel__disable (struct evsel *evsel);int perf_evsel__open_per_cpu (struct evsel *evsel,struct perf_cpu_map *cpus);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 44/107 perf evsel: Rename perf_evsel__apply_filter() to evsel__apply_filter()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__apply_filter() to evsel__apply_filter(), so we don't have a name clash when we add perf_evsel__apply_filter() in libperf.
--- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/evlist.c +1 -1
@@ -1158,7 +1158,7 @@ int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel)* filters only work for tracepoint event, which doesn't have cpu limit. * So evlist and evsel should always be same. */ - err =perf_evsel__apply_filter (evsel, evsel->filter); + err =evsel__apply_filter (evsel, evsel->filter);if (err) { *err_evsel = evsel;break ;
tools/perf/util/evsel.c +1 -1
@@ -1187,7 +1187,7 @@ static int perf_evsel__run_ioctl(struct evsel *evsel,return 0 ; } -int perf_evsel__apply_filter (struct evsel *evsel,const char *filter) +int evsel__apply_filter (struct evsel *evsel,const char *filter) { return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_SET_FILTER,
tools/perf/util/evsel.h +1 -1
@@ -294,7 +294,7 @@ int perf_evsel__set_filter(struct evsel *evsel, const char *filter);int perf_evsel__append_tp_filter (struct evsel *evsel,const char *filter);int perf_evsel__append_addr_filter (struct evsel *evsel,const char *filter); -int perf_evsel__apply_filter (struct evsel *evsel,const char *filter); +int evsel__apply_filter (struct evsel *evsel,const char *filter);int evsel__enable (struct evsel *evsel);int evsel__disable (struct evsel *evsel);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 45/107 perf evsel: Rename perf_evsel__cpus() to evsel__cpus()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evsel__cpus() to evsel__cpus(), so we don't have a name clash when we add perf_evsel__cpus() in libperf.
--- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/stat-display.c | 6 +++--- tools/perf/util/stat.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/util/evsel.h +2 -2
@@ -197,14 +197,14 @@ struct target;struct thread_map ;struct record_opts ; -static inline struct perf_cpu_map *perf_evsel__cpus (struct evsel *evsel) +static inline struct perf_cpu_map *evsel__cpus (struct evsel *evsel) {return evsel->cpus; }static inline int perf_evsel__nr_cpus (struct evsel *evsel) { -return perf_evsel__cpus (evsel)->nr; +return evsel__cpus (evsel)->nr; } void perf_counts_values__scale(struct perf_counts_values *count,
tools/perf/util/stat-display.c +3 -3
@@ -109,7 +109,7 @@ static void aggr_printout(struct perf_stat_config *config, }else {fprintf (config->output,"CPU%*d%s " , config->csv_output ?0 :-5 , -perf_evsel__cpus (evsel)->map[id], +evsel__cpus (evsel)->map[id], config->csv_sep); }break ;
@@ -325,7 +325,7 @@ static int first_shadow_cpu(struct perf_stat_config *config,return 0 ;for (i =0 ; i <perf_evsel__nr_cpus (evsel); i++) { -int cpu2 =perf_evsel__cpus (evsel)->map[i]; +int cpu2 =evsel__cpus (evsel)->map[i];if (config->aggr_get_id (config, evlist->cpus, cpu2) == id)return cpu2;
@@ -593,7 +593,7 @@ static void aggr_cb(struct perf_stat_config *config,for (cpu =0 ; cpu <perf_evsel__nr_cpus (counter); cpu++) {struct perf_counts_values *counts; - s2 = config->aggr_get_id (config,perf_evsel__cpus (counter), cpu); + s2 = config->aggr_get_id (config,evsel__cpus (counter), cpu);if (s2 != ad->id)continue ;if (first)
tools/perf/util/stat.c +2 -2
@@ -215,7 +215,7 @@ static int check_per_pkg(struct evsel *counter, struct perf_counts_values *vals, int cpu, bool *skip) { unsigned long *mask = counter->per_pkg_mask; -struct perf_cpu_map *cpus =perf_evsel__cpus (counter); +struct perf_cpu_map *cpus =evsel__cpus (counter);int s; *skip = false;
@@ -483,7 +483,7 @@ int create_perf_stat_counter(struct evsel *evsel, }if (target__has_cpu (target) && !target__has_per_thread (target)) -return perf_evsel__open_per_cpu (evsel,perf_evsel__cpus (evsel)); +return perf_evsel__open_per_cpu (evsel,evsel__cpus (evsel));return perf_evsel__open_per_thread (evsel, evsel->threads); }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 46/107 perf evlist: Rename perf_evlist__open() to evlist__open()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__open() to evlist__open(), so we don't have a name clash when we add perf_evlist__open() in libperf.
--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/backward-ring-buffer.c | 2 +- tools/perf/tests/bpf.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 2 +- tools/perf/util/python.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -83,7 +83,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe evsel->attr.disabled =1 ; evsel->attr.enable_on_exec =0 ; -CHECK__ (perf_evlist__open (evlist)); +CHECK__ (evlist__open (evlist));CHECK__ (perf_evlist__mmap (evlist,UINT_MAX ));
tools/perf/builtin-kvm.c +1 -1
@@ -1048,7 +1048,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) attr->disabled =1 ; } - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {printf ("Couldn't create the events: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/builtin-trace.c +1 -1
@@ -3342,7 +3342,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) } } - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) goto out_error_open;
tools/perf/tests/backward-ring-buffer.c +1 -1
@@ -125,7 +125,7 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __mperf_evlist__config (evlist, &opts,NULL ); - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/bpf.c +1 -1
@@ -157,7 +157,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),perf_evlist__config (evlist, &opts,NULL ); - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/code-reading.c +1 -1
@@ -646,7 +646,7 @@ static int do_test_code_reading(bool try_kcore) evsel->attr.disabled =1 ; evsel->attr.enable_on_exec =0 ; - ret =perf_evlist__open (evlist); + ret =evlist__open (evlist);if (ret <0 ) {if (!excl_kernel) { excl_kernel = true;
tools/perf/tests/event-times.c +1 -1
@@ -38,7 +38,7 @@ static int attach__enable_on_exec(struct evlist *evlist) evsel->attr.enable_on_exec =1 ; - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/keep-tracking.c +1 -1
@@ -94,7 +94,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un evsel->attr.disabled =1 ; evsel->attr.enable_on_exec =0 ; -if (perf_evlist__open (evlist) <0 ) { +if (evlist__open (evlist) <0 ) {pr_debug ("Unable to open dummy and cycles event\n" ); err =TEST_SKIP ; goto out_err;
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -60,7 +60,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtestthread_map__set_pid (evlist->threads,0 ,getpid ()); - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/perf-record.c +1 -1
@@ -130,7 +130,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus* Call sys_perf_event_open on all the fds on all the evsels, * grouping them if asked to. */ - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));
tools/perf/tests/sw-clock.c +1 -1
@@ -69,7 +69,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) cpus =NULL ; threads =NULL ; -if (perf_evlist__open (evlist)) { +if (evlist__open (evlist)) {const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ; err = -errno;
tools/perf/tests/switch-tracking.c +1 -1
@@ -450,7 +450,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ } } -if (perf_evlist__open (evlist) <0 ) { +if (evlist__open (evlist) <0 ) {pr_debug ("Not supported\n" ); err =0 ; goto out;
tools/perf/tests/task-exit.c +1 -1
@@ -95,7 +95,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused evsel->attr.wakeup_events =1 ; evsel->attr.exclude_kernel =1 ; - err =perf_evlist__open (evlist); + err =evlist__open (evlist);if (err <0 ) {pr_debug ("Couldn't open the evlist: %s\n" ,str_error_r (-err, sbuf,sizeof (sbuf)));
tools/perf/util/evlist.c +1 -1
@@ -1387,7 +1387,7 @@ static int perf_evlist__create_syswide_maps(struct evlist *evlist) goto out; } -int perf_evlist__open (struct evlist *evlist) +int evlist__open (struct evlist *evlist) {struct evsel *evsel;int err;
tools/perf/util/evlist.h +1 -1
@@ -146,7 +146,7 @@ void perf_evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state stavoid perf_evlist__mmap_consume (struct evlist *evlist,int idx); -int perf_evlist__open (struct evlist *evlist); +int evlist__open (struct evlist *evlist);void perf_evlist__close (struct evlist *evlist);struct callchain_param ;
tools/perf/util/python.c +1 -1
@@ -1059,7 +1059,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist,if (group)perf_evlist__set_leader (evlist); -if (perf_evlist__open (evlist) <0 ) { +if (evlist__open (evlist) <0 ) {PyErr_SetFromErrno (PyExc_OSError);return NULL ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 47/107 perf evlist: Rename perf_evlist__close() to evlist__close()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__close() to evlist__close(), so we don't have a name clash when we add perf_evlist__close() in libperf.
--- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-stat.c | 4 ++-- tools/perf/util/evlist.c | 6 +++--- tools/perf/util/evlist.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/builtin-kvm.c +1 -1
@@ -1058,7 +1058,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)if (perf_evlist__mmap (evlist, kvm->opts.mmap_pages) <0 ) {ui__error ("Failed to mmap the events: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf))); -perf_evlist__close (evlist); +evlist__close (evlist); goto out; }
tools/perf/builtin-stat.c +2 -2
@@ -613,7 +613,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)* later the evsel_list will be closed after. */ if (!STAT_RECORD ) -perf_evlist__close (evsel_list); +evlist__close (evsel_list);return WEXITSTATUS (status); }
@@ -2003,7 +2003,7 @@ int cmd_stat(int argc, const char **argv)perf_session__write_header (perf_stat.session, evsel_list, fd, true); } -perf_evlist__close (evsel_list); +evlist__close (evsel_list);perf_session__delete (perf_stat.session); }
tools/perf/util/evlist.c +3 -3
@@ -140,7 +140,7 @@ void evlist__delete(struct evlist *evlist)return ;perf_evlist__munmap (evlist); -perf_evlist__close (evlist); +evlist__close (evlist);cpu_map__put (evlist->cpus);thread_map__put (evlist->threads); evlist->cpus =NULL ;
@@ -1348,7 +1348,7 @@ void perf_evlist__set_selected(struct evlist *evlist, evlist->selected = evsel; } -void perf_evlist__close (struct evlist *evlist) +void evlist__close (struct evlist *evlist) {struct evsel *evsel;
@@ -1412,7 +1412,7 @@ int evlist__open(struct evlist *evlist)return 0 ; out_err: -perf_evlist__close (evlist); +evlist__close (evlist); errno = -err;return err; }
tools/perf/util/evlist.h +1 -1
@@ -147,7 +147,7 @@ void perf_evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state stavoid perf_evlist__mmap_consume (struct evlist *evlist,int idx);int evlist__open (struct evlist *evlist); -void perf_evlist__close (struct evlist *evlist); +void evlist__close (struct evlist *evlist);struct callchain_param ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 48/107 perf evlist: Rename perf_evlist__enable() to evlist__enable()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Rename perf_evlist__enable() to evlist__enable(), so we don't have a name clash when we add perf_evlist__enable() in libperf.
--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 4 ++-- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 4 ++-- tools/perf/tests/backward-ring-buffer.c | 2 +- tools/perf/tests/bpf.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/keep-tracking.c | 4 ++-- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evlist.h | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -97,7 +97,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe goto out_err; } -perf_evlist__enable (evlist); +evlist__enable (evlist); comm1 ="Test COMM 1" ;CHECK__ (prctl (PR_SET_NAME , (unsigned long )comm1,0 ,0 ,0 ));
tools/perf/builtin-kvm.c +1 -1
@@ -972,7 +972,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm) goto out;/* everything is good - enable the events and process */ -perf_evlist__enable (kvm->evlist); +evlist__enable (kvm->evlist);while (!done) {struct fdarray *fda = &kvm->evlist->pollfd;
tools/perf/builtin-record.c +2 -2
@@ -1453,7 +1453,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)* so don't spoil it by prematurely enabling them. */ if (!target__none (&opts->target) && !opts->initial_delay) -perf_evlist__enable (rec->evlist); +evlist__enable (rec->evlist);/* * Let the child rip
@@ -1506,7 +1506,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)if (opts->initial_delay) {usleep (opts->initial_delay *USEC_PER_MSEC ); -perf_evlist__enable (rec->evlist); +evlist__enable (rec->evlist); }trigger_ready (&auxtrace_snapshot_trigger);
tools/perf/builtin-stat.c +1 -1
@@ -362,7 +362,7 @@ static void enable_counters(void)* - we have initial delay configured */ if (!target__none (&target) || stat_config.initial_delay) -perf_evlist__enable (evsel_list); +evlist__enable (evsel_list); }static void disable_counters (void )
tools/perf/builtin-top.c +1 -1
@@ -1255,7 +1255,7 @@ static int __cmd_top(struct perf_top *top)* so leave the check here. */ if (!target__none (&opts->target)) -perf_evlist__enable (top->evlist); +evlist__enable (top->evlist); ret =-1 ;if (pthread_create (&thread_process,NULL , process_thread, top)) {
tools/perf/builtin-trace.c +2 -2
@@ -3402,14 +3402,14 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_error_mmap;if (!target__none (&trace->opts.target) && !trace->opts.initial_delay) -perf_evlist__enable (evlist); +evlist__enable (evlist);if (forks)perf_evlist__start_workload (evlist);if (trace->opts.initial_delay) {usleep (trace->opts.initial_delay *1000 ); -perf_evlist__enable (evlist); +evlist__enable (evlist); } trace->multiple_threads = thread_map__pid(evlist->threads, 0) == -1 ||
tools/perf/tests/backward-ring-buffer.c +1 -1
@@ -68,7 +68,7 @@ static int do_test(struct evlist *evlist, int mmap_pages,return TEST_FAIL ; } -perf_evlist__enable (evlist); +evlist__enable (evlist);testcase ();perf_evlist__disable (evlist);
tools/perf/tests/bpf.c +1 -1
@@ -171,7 +171,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void), goto out_delete_evlist; } -perf_evlist__enable (evlist); +evlist__enable (evlist); (*func)();perf_evlist__disable (evlist);
tools/perf/tests/code-reading.c +1 -1
@@ -680,7 +680,7 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } -perf_evlist__enable (evlist); +evlist__enable (evlist);do_something ();
tools/perf/tests/keep-tracking.c +2 -2
@@ -107,7 +107,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un* enabled. */ -perf_evlist__enable (evlist); +evlist__enable (evlist); comm ="Test COMM 1" ;CHECK__ (prctl (PR_SET_NAME , (unsigned long )comm,0 ,0 ,0 ));
@@ -125,7 +125,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un* disabled with the dummy event still enabled. */ -perf_evlist__enable (evlist); +evlist__enable (evlist); evsel =perf_evlist__last (evlist);
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -74,7 +74,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest goto out_delete_evlist; } -perf_evlist__enable (evlist); +evlist__enable (evlist);/* * Generate the event:
tools/perf/tests/perf-record.c +1 -1
@@ -153,7 +153,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus* Now that all is properly set up, enable the events, they will * count just on workload.pid, which will start... */ -perf_evlist__enable (evlist); +evlist__enable (evlist);/* * Now!
tools/perf/tests/sw-clock.c +1 -1
@@ -86,7 +86,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_delete_evlist; } -perf_evlist__enable (evlist); +evlist__enable (evlist);/* collect samples */ for (i =0 ; i <NR_LOOPS ; i++)
tools/perf/tests/switch-tracking.c +1 -1
@@ -462,7 +462,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } -perf_evlist__enable (evlist); +evlist__enable (evlist); err =evsel__disable (cpu_clocks_evsel);if (err) {
tools/perf/util/evlist.c +2 -2
@@ -356,7 +356,7 @@ void perf_evlist__disable(struct evlist *evlist) evlist->enabled = false; } -void perf_evlist__enable (struct evlist *evlist) +void evlist__enable (struct evlist *evlist) {struct evsel *pos;
@@ -371,7 +371,7 @@ void perf_evlist__enable(struct evlist *evlist)void perf_evlist__toggle_enable (struct evlist *evlist) { - (evlist->enabled ? perf_evlist__disable : perf_evlist__enable)(evlist); + (evlist->enabled ? perf_evlist__disable : evlist__enable)(evlist); } static int perf_evlist__enable_event_cpu(struct evlist *evlist,
tools/perf/util/evlist.h +1 -1
@@ -185,7 +185,7 @@ void perf_evlist__munmap(struct evlist *evlist);size_t perf_evlist__mmap_size (unsigned long pages);void perf_evlist__disable (struct evlist *evlist); -void perf_evlist__enable (struct evlist *evlist); +void evlist__enable (struct evlist *evlist);void perf_evlist__toggle_enable (struct evlist *evlist); int perf_evlist__enable_event_idx(struct evlist *evlist,
Signature · 1 line
2.21.0