perf/core improvements and fixes
Subsystems (2)
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling, this is on top of
perf-core-for-mingo-4.20-20180919, that is not yet in tip.
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit 24ef0fd0a1f389b156e6ef0edd71072728831bd9:
perf python: Use -Wno-redundant-decls to build with PYTHON=python3 (2018-09-19 10:25:13 -0300)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-4.20-20180919
for you to fetch changes up to 24ef0fd0a1f389b156e6ef0edd71072728831bd9:
perf python: Use -Wno-redundant-decls to build with PYTHON=python3 (2018-09-19 10:25:13 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
perf test:
- Add watchpoint entry (Ravi Bangoria)
Build fixes:
- Initialize perf_data_file fd field to fix building the CTF (trace format) converter with with gcc 4.8.4 on Ubuntu 14.04 (J?r?mie Galarneau)
- Use -Wno-redundant-decls to build with PYTHON=python3 to build the python binding, fixing the build in systems such as Clear Linux (Arnaldo Carvalho de Melo)
Hardware tracing:
- Suppress AUX/OVERWRITE records (Alexander Shishkin)
Infrastructure:
- Adopt PTR_ERR_OR_ZERO from the kernel and use it in the bpf-loader instead of open coded equivalent (Ding Xiang)
- Improve the event ordering code to make it clear and fix a bug related to freeing of events when using pipe mode from 'record' to 'inject' (Jiri Olsa)
- Some prep work to facilitate per-cpu threads to write record data to per-cpu files (Jiri Olsa)
----------------------------------------------------------------
Test results:
The first ones are container (docker) 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.
The Clear Linux container is building with NO_CLANG=1, the problem preventing its use when building for python3 has been identified and the next builds will build in ClearLinux with both gcc and clang. This time around only gcc was used.
# dm 1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 5 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 6 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 7 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28) 8 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) 9 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 10 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 11 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 12 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) 13 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28) 14 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 8.2.1 20180502 15 debian:7 : Ok gcc (Debian 4.7.2-5) 4.7.2 16 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u1) 4.9.2 17 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 18 debian:experimental : Ok gcc (Debian 8.2.0-4) 8.2.0 19 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.2.0-4) 8.2.0 20 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.2.0-4) 8.2.0 21 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.1.0-12) 8.1.0 22 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.2.0-4) 8.2.0 23 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7) 24 fedora:21 : Ok gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6) 25 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) 26 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) 27 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) 28 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 29 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) 30 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2) 31 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6) 32 fedora:28 : Ok gcc (GCC) 8.1.1 20180712 (Red Hat 8.1.1-5) 33 fedora:rawhide : Ok gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3) 34 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 7.3.0-r3 p1.4) 7.3.0 35 mageia:5 : Ok gcc (GCC) 4.9.2 36 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0 37 opensuse:13.2 : Ok gcc (SUSE Linux) 4.8.3 20140627 [gcc-4_8-branch revision 212064] 38 opensuse:42.1 : Ok gcc (SUSE Linux) 4.8.5 39 opensuse:42.2 : Ok gcc (SUSE Linux) 4.8.5 40 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5 41 opensuse:tumbleweed : Ok gcc (SUSE Linux) 7.3.1 20180323 [gcc-7-branch revision 258812] 42 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1) 43 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28.0.1) 44 ubuntu:12.04.5 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 45 ubuntu:14.04.4 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 46 ubuntu:14.04.4-x-linaro-arm64 : Ok aarch64-linux-gnu-gcc (Linaro GCC 5.5-2017.10) 5.5.0 47 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609 48 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 49 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 50 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 51 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 52 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 53 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 54 ubuntu:16.10 : Ok gcc (Ubuntu 6.2.0-5ubuntu12) 6.2.0 20161005 55 ubuntu:17.10 : Ok gcc (Ubuntu 7.2.0-8ubuntu3.2) 7.2.0 56 ubuntu:18.04 : Ok gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 57 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.3.0-16ubuntu3) 7.3.0 58 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.3.0-16ubuntu3) 7.3.0 59 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 60 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 61 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 62 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 63 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 64 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 65 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 66 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 67 ubuntu:18.10 : Ok gcc (Ubuntu 8.2.0-4ubuntu1) 8.2.0
# uname -a
Linux jouet 4.19.0-rc4-00022-gad3273d5f1b9 #1 SMP Mon Sep 17 17:18:22 -03 2018 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
d35c595bf005 perf vendor events arm64: Revise core JSON events for eMAG
# perf version --build-options
perf version 4.19.rc2.gd35c595
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
# 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: x86 rdpmc : Ok
60: Convert perf time to TSC : Ok
61: DWARF unwind : Ok
62: x86 instruction decoder - new instructions : Ok
63: x86 bp modify : Ok
64: Use vfs_getname probe to get syscall args filenames : Ok
65: Check open filename arg using perf trace + vfs_getname: Ok
66: probe libc's inet_pton & backtrace it with ping : Ok
67: Add vfs_getname probe to get syscall args filenames : Ok $ make -C tools/perf build-test
make: Entering directory '/home/acme/git/perf/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_install_bin_O: make install-bin
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_gtk2_O: make NO_GTK2=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
make_pure_O: make
make_no_libnuma_O: make NO_LIBNUMA=1
make_install_O: make install
make_no_libunwind_O: make NO_LIBUNWIND=1
make_no_libperl_O: make NO_LIBPERL=1
make_no_libbpf_O: make NO_LIBBPF=1
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_help_O: make help
make_no_auxtrace_O: make NO_AUXTRACE=1
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_slang_O: make NO_SLANG=1
make_with_babeltrace_O: make LIBBABELTRACE=1
make_clean_all_O: make clean all
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_no_libaudit_O: make NO_LIBAUDIT=1
make_util_map_o_O: make util/map.o
make_debug_O: make DEBUG=1
make_no_libpython_O: make NO_LIBPYTHON=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_no_demangle_O: make NO_DEMANGLE=1
make_tags_O: make tags
make_static_O: make LDFLAGS=-static
make_perf_o_O: make perf.o
make_no_libelf_O: make NO_LIBELF=1
make_doc_O: make doc
make_no_newt_O: make NO_NEWT=1
make_install_prefix_O: make install prefix=/tmp/krava
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$ Arnaldo Carvalho de Melo
maintainerPATCH 1/27 perf help: Add missing subcommand `version`
From: Sangwon Hong <[email protected]>
There isn't subcommand version when typing perf help.
Before :
$ perf help | grep version usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS]
So add perf-version in command-list.txt for listing it when typing perf help.
After :
$ perf help | grep version
usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS]
version display the version of perf binary
--- tools/perf/command-list.txt | 1 + 1 file changed, 1 insertion(+)
tools/perf/command-list.txt +1 -0
@@ -30,3 +30,4 @@ perf-test mainporcelain common perf-timechart mainporcelain common perf-top mainporcelain common perf-trace mainporcelain audit +perf-version mainporcelain common
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 2/27 perf tools: Report itrace options in help
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
I often forget all the options that --itrace accepts. Instead of burying them in the man page only report them in the normal command line help too to make them easier accessible.
v2: Align
--- tools/perf/builtin-inject.c | 3 ++- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-script.c | 2 +- tools/perf/util/auxtrace.h | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-)
tools/perf/builtin-inject.c +2 -1
@@ -798,7 +798,8 @@ int cmd_inject(int argc, const char **argv) "kallsyms pathname"),OPT_BOOLEAN ('f' ,"force" , &data.force,"don't complain, do it" ),OPT_CALLBACK_OPTARG (0 ,"itrace" , &inject.itrace_synth_opts, -NULL ,"opts" ,"Instruction Tracing options" , +NULL ,"opts" ,"Instruction Tracing options\n" +ITRACE_HELP , itrace_parse_synth_opts),OPT_BOOLEAN (0 ,"strip" , &inject.strip, "strip non-synthesized events (use with --itrace)"),
tools/perf/builtin-report.c +1 -1
@@ -1104,7 +1104,7 @@ int cmd_report(int argc, const char **argv)OPT_CALLBACK (0 ,"percentage" ,NULL ,"relative|absolute" ,"how to display percentage of filtered entries" , parse_filter_percentage),OPT_CALLBACK_OPTARG (0 ,"itrace" , &itrace_synth_opts,NULL ,"opts" , -"Instruction Tracing options" , +"Instruction Tracing options\n" ITRACE_HELP , itrace_parse_synth_opts),OPT_BOOLEAN (0 ,"full-source-path" , &srcline_full_filename, "Show full source file name path for source lines"),
tools/perf/builtin-script.c +1 -1
@@ -3193,7 +3193,7 @@ int cmd_script(int argc, const char **argv)OPT_BOOLEAN (0 ,"ns" , &nanosecs,"Use 9 decimal places when displaying time" ),OPT_CALLBACK_OPTARG (0 ,"itrace" , &itrace_synth_opts,NULL ,"opts" , -"Instruction Tracing options" , +"Instruction Tracing options\n" ITRACE_HELP , itrace_parse_synth_opts),OPT_BOOLEAN (0 ,"full-source-path" , &srcline_full_filename, "Show full source file name path for source lines"),
tools/perf/util/auxtrace.h +19 -0
@@ -576,6 +576,23 @@ static inline void auxtrace__free(struct perf_session *session)return session->auxtrace->free (session); } +#define ITRACE_HELP \ +" i: synthesize instructions events\n" \ +" b: synthesize branches events\n" \ +" c: synthesize branches events (calls only)\n" \ +" r: synthesize branches events (returns only)\n" \ +" x: synthesize transactions events\n" \ +" w: synthesize ptwrite events\n" \ +" p: synthesize power events\n" \ +" e: synthesize error events\n" \ +" d: create a debug log\n" \ +" g[len]: synthesize a call chain (use with i or x)\n" \ +" l[len]: synthesize last branch entries (use with i or x)\n" \ +" sNUMBER: skip initial number of events\n" \ +" PERIOD[ns|us|ms|i|t]: specify period to sample stream\n" \ +" concatenate multiple options. Default is ibxwpe or cewp\n" + +#else static inline struct auxtrace_record *
@@ -716,6 +733,8 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp, struct perf_evlist *evlist, int idx, bool per_cpu); +#define ITRACE_HELP "" +#endif #endif
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 3/27 tools lib subcmd: Support overwriting the pager
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
Add an interface to the auto pager code that allows callers to overwrite the pager.
--- tools/lib/subcmd/pager.c | 11 ++++++++++- tools/lib/subcmd/pager.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-)
tools/lib/subcmd/pager.c +10 -1
@@ -23,6 +23,13 @@ void pager_init(const char *pager_env) subcmd_config.pager_env = pager_env; } +static const char *forced_pager; + +void force_pager (const char *pager) +{ + forced_pager = pager; +} +static void pager_preexec (void ) {/*
@@ -66,7 +73,9 @@ void setup_pager(void)const char *pager =getenv (subcmd_config.pager_env);struct winsize sz; -if (!isatty (1 )) +if (forced_pager) + pager = forced_pager; +if (!isatty (1 ) && !forced_pager)return ;if (ioctl (1 ,TIOCGWINSZ , &sz) ==0 ) pager_columns = sz.ws_col;
tools/lib/subcmd/pager.h +1 -0
@@ -7,5 +7,6 @@ extern void pager_init(const char *pager_env);extern void setup_pager (void );extern int pager_in_use (void );extern int pager_get_columns (void ); +extern void force_pager (const char *);#endif /* __SUBCMD_PAGER_H */
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 4/27 perf script: Allow sym and dso without ip, addr
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
Currently sym and dso require printing ip and addr because the print function is tied to those outputs. With callindent it makes sense to print the symbol or dso without numerical IP or ADDR. So change the dependency check to only check the underlying attribute.
Also the branch target output relies on the user_set flag to determine if the branch target should be implicitely printed. When modifying the fields with + or - also set user_set, so that ADDR can be removed. We also need to set wildcard_set to make the initial sanity check pass.
This allows to remove a lot of noise in callindent output by dropping the numerical addresses, which are not all that useful.
Before
% perf script --itrace=cr -F +callindent
swapper 0 [000] 156546.354971: 1 branches: pt_config 0 [unknown] ([unknown]) => ffffffff81010486 pt_config ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: pt_config ffffffff81010499 pt_config ([kernel.kallsyms]) => ffffffff8101063e pt_event_add ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: pt_event_add ffffffff81010635 pt_event_add ([kernel.kallsyms]) => ffffffff8115e687 event_sched_in.isra.107 ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: perf_pmu_enable ffffffff8115e726 event_sched_in.isra.107 ([kernel.kallsyms]) => ffffffff811579b0 perf_pmu_enable ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: perf_pmu_nop_void ffffffff81151730 perf_pmu_nop_void ([kernel.kallsyms]) => ffffffff8115e72b event_sched_in.isra.107 ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: event_sched_in.isra.107 ffffffff8115e737 event_sched_in.isra.107 ([kernel.kallsyms]) => ffffffff8115e7a5 group_sched_in ([kernel.kallsyms])
swapper 0 [000] 156546.354971: 1 branches: __x86_indirect_thunk_rax ffffffff8115e7f6 group_sched_in ([kernel.kallsyms]) => ffffffff81a03000 __x86_indirect_thunk_rax ([kernel.kallsyms])After
% perf script --itrace=cr -F +callindent,-ip,-sym,-symoff
swapper 0 [000] 156546.354971: 1 branches: pt_config
swapper 0 [000] 156546.354971: 1 branches: pt_config
swapper 0 [000] 156546.354971: 1 branches: pt_event_add
swapper 0 [000] 156546.354971: 1 branches: perf_pmu_enable
swapper 0 [000] 156546.354971: 1 branches: perf_pmu_nop_void
swapper 0 [000] 156546.354971: 1 branches: event_sched_in.isra.107
swapper 0 [000] 156546.354971: 1 branches: __x86_indirect_thunk_rax
swapper 0 [000] 156546.354971: 1 branches: perf_pmu_nop_int
swapper 0 [000] 156546.354971: 1 branches: group_sched_in
swapper 0 [000] 156546.354971: 1 branches: event_filter_match
swapper 0 [000] 156546.354971: 1 branches: event_filter_match
swapper 0 [000] 156546.354971: 1 branches: group_sched_in--- tools/perf/builtin-script.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
tools/perf/builtin-script.c +10 -7
@@ -406,9 +406,10 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel, PERF_OUTPUT_WEIGHT))return -EINVAL ; -if (PRINT_FIELD (SYM ) && !PRINT_FIELD (IP ) && !PRINT_FIELD (ADDR )) { +if (PRINT_FIELD (SYM ) && + !(evsel->attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) {pr_err ("Display of symbols requested but neither sample IP nor " -"sample address\nis selected. Hence, no addresses to convert " +"sample address\navailable. Hence, no addresses to convert " "to symbols.\n" );return -EINVAL ; }
@@ -417,10 +418,9 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel, "selected.\n");return -EINVAL ; } -if (PRINT_FIELD (DSO ) && !PRINT_FIELD (IP ) && !PRINT_FIELD (ADDR ) && - !PRINT_FIELD (BRSTACK ) && !PRINT_FIELD (BRSTACKSYM ) && !PRINT_FIELD (BRSTACKOFF )) { -pr_err ("Display of DSO requested but no address to convert. Select\n" -"sample IP, sample address, brstack, brstacksym, or brstackoff.\n" ); +if (PRINT_FIELD (DSO ) && + !(evsel->attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) { +pr_err ("Display of DSO requested but no address to convert.\n" );return -EINVAL ; }if (PRINT_FIELD (SRCLINE ) && !PRINT_FIELD (IP )) {
@@ -2491,6 +2491,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused, output[j].fields &= ~all_output_options[i].field; else output[j].fields |= all_output_options[i].field; + output[j].user_set = true; + output[j].wildcard_set = true; } } }else {
@@ -2501,7 +2503,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused, rc = -EINVAL ; goto out; } - output[type].fields |= all_output_options[i].field; + output[type].user_set = true; + output[type].wildcard_set = true; } }
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 5/27 perf script: Print DSO for callindent
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
Now that we don't need to print the IP/ADDR for callindent the DSO is also not printed. It's useful for some cases, so add an own DSO printout for callindent for the case when IP/ADDR is not enabled.
Before:
% perf script --itrace=cr -F +callindent,-ip,-sym,-symoff,-addr
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_event_add
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_enable
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_void
swapper 0 [000] 3377.917072: 1 branches: event_sched_in.isra.107
swapper 0 [000] 3377.917072: 1 branches: __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_int
swapper 0 [000] 3377.917072: 1 branches: group_sched_in
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: group_sched_inAfter:
swapper 0 [000] 3377.917072: 1 branches: ([unknown]) pt_config
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) pt_config
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) pt_event_add
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_enable
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_void
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_sched_in.isra.107
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_int
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) group_sched_in
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_filter_match
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_filter_match
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) group_sched_in
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_txn
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_sched_in.isra.107(in the kernel case of course it's not very useful, but it's important with user programs where symbols are not unique)
--- tools/perf/builtin-script.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/builtin-script.c +8 -1
@@ -1115,6 +1115,7 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,const char *name =NULL ;static int spacing;int len =0 ; +int dlen =0 ;u64 ip =0 ;/*
@@ -1141,6 +1142,12 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample, ip = sample->ip; } +if (PRINT_FIELD (DSO ) && !(PRINT_FIELD (IP ) ||PRINT_FIELD (ADDR ))) { + dlen +=fprintf (fp,"(" ); + dlen +=map__fprintf_dsoname (al->map, fp); + dlen +=fprintf (fp,")\t" ); + } +if (name) len =fprintf (fp,"%*s%s" , (int )depth *4 ,"" , name);else if (ip)
@@ -1159,7 +1166,7 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,if (len < spacing) len +=fprintf (fp,"%*s" , spacing - len,"" ); -return len; +return len + dlen; } static int perf_sample__fprintf_insn(struct perf_sample *sample,
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 6/27 tools lib traceevent, perf tools: Rename struct event_format to struct tep_event_format
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames struct event_format to struct tep_event_format
--- tools/lib/traceevent/event-parse.c | 186 ++++++++++----------- tools/lib/traceevent/event-parse.h | 66 ++++---- tools/lib/traceevent/parse-filter.c | 42 ++--- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_hrtimer.c | 4 +- tools/lib/traceevent/plugin_kmem.c | 2 +- tools/lib/traceevent/plugin_kvm.c | 14 +- tools/lib/traceevent/plugin_mac80211.c | 4 +- tools/lib/traceevent/plugin_sched_switch.c | 4 +- tools/perf/builtin-trace.c | 2 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 2 +- tools/perf/util/python.c | 4 +- .../perf/util/scripting-engines/trace-event-perl.c | 6 +- .../util/scripting-engines/trace-event-python.c | 8 +- tools/perf/util/trace-event-parse.c | 14 +- tools/perf/util/trace-event.c | 8 +- tools/perf/util/trace-event.h | 16 +- 18 files changed, 194 insertions(+), 194 deletions(-)
tools/lib/traceevent/event-parse.c +93 -93
@@ -95,7 +95,7 @@ struct tep_function_handler {static unsigned long long process_defined_func (struct trace_seq *s,void *data,int size, -struct event_format *event,struct print_arg *arg); +struct tep_event_format *event,struct print_arg *arg);static void free_func_handle (struct tep_function_handler *func);
@@ -738,16 +738,16 @@ void tep_print_printk(struct tep_handle *pevent) } } -static struct event_format *alloc_event (void ) +static struct tep_event_format *alloc_event (void ) { -return calloc (1 ,sizeof (struct event_format )); +return calloc (1 ,sizeof (struct tep_event_format )); } -static int add_event (struct tep_handle *pevent,struct event_format *event) +static int add_event (struct tep_handle *pevent,struct tep_event_format *event) {int i; -struct event_format **events =realloc (pevent->events,sizeof (event) * - (pevent->nr_events +1 )); +struct tep_event_format **events =realloc (pevent->events,sizeof (event) * + (pevent->nr_events +1 ));if (!events)return -1 ;
@@ -1354,7 +1354,7 @@ static unsigned int type_size(const char *name)return 0 ; } -static int event_read_fields (struct event_format *event,struct format_field **fields) +static int event_read_fields (struct tep_event_format *event,struct format_field **fields) {struct format_field *field =NULL ;enum event_type type;
@@ -1641,7 +1641,7 @@ static int event_read_fields(struct event_format *event, struct format_field **freturn -1 ; } -static int event_read_format (struct event_format *event) +static int event_read_format (struct tep_event_format *event) {char *token;int ret;
@@ -1674,11 +1674,11 @@ static int event_read_format(struct event_format *event) }static enum event_type -process_arg_token (struct event_format *event,struct print_arg *arg, +process_arg_token (struct tep_event_format *event,struct print_arg *arg,char **tok,enum event_type type);static enum event_type -process_arg (struct event_format *event,struct print_arg *arg,char **tok) +process_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) {enum event_type type;char *token;
@@ -1690,14 +1690,14 @@ process_arg(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_op (struct event_format *event,struct print_arg *arg,char **tok); +process_op (struct tep_event_format *event,struct print_arg *arg,char **tok);/* * For __print_symbolic() and __print_flags, we need to completely * evaluate the first argument, which defines what to print next. */ static enum event_type -process_field_arg (struct event_format *event,struct print_arg *arg,char **tok) +process_field_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) {enum event_type type;
@@ -1711,7 +1711,7 @@ process_field_arg(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_cond (struct event_format *event,struct print_arg *top,char **tok) +process_cond (struct tep_event_format *event,struct print_arg *top,char **tok) {struct print_arg *arg, *left, *right;enum event_type type;
@@ -1767,7 +1767,7 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok) }static enum event_type -process_array (struct event_format *event,struct print_arg *top,char **tok) +process_array (struct tep_event_format *event,struct print_arg *top,char **tok) {struct print_arg *arg;enum event_type type;
@@ -1869,7 +1869,7 @@ static int set_op_prio(struct print_arg *arg)/* Note, *tok does not get freed, but will most likely be saved */ static enum event_type -process_op (struct event_format *event,struct print_arg *arg,char **tok) +process_op (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *left, *right =NULL ;enum event_type type;
@@ -2070,7 +2070,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_entry (struct event_format *event__maybe_unused ,struct print_arg *arg, +process_entry (struct tep_event_format *event__maybe_unused ,struct print_arg *arg,char **tok) {enum event_type type;
@@ -2109,7 +2109,7 @@ process_entry(struct event_format *event __maybe_unused, struct print_arg *arg,return EVENT_ERROR ; } -static int alloc_and_process_delim (struct event_format *event,char *next_token, +static int alloc_and_process_delim (struct tep_event_format *event,char *next_token,struct print_arg **print_arg) {struct print_arg *field;
@@ -2444,7 +2444,7 @@ static char *arg_eval (struct print_arg *arg) }static enum event_type -process_fields (struct event_format *event,struct print_flag_sym **list,char **tok) +process_fields (struct tep_event_format *event,struct print_flag_sym **list,char **tok) {enum event_type type;struct print_arg *arg =NULL ;
@@ -2525,7 +2525,7 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char ** }static enum event_type -process_flags (struct event_format *event,struct print_arg *arg,char **tok) +process_flags (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *field;enum event_type type;
@@ -2578,7 +2578,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_symbols (struct event_format *event,struct print_arg *arg,char **tok) +process_symbols (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *field;enum event_type type;
@@ -2617,7 +2617,7 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_hex_common (struct event_format *event,struct print_arg *arg, +process_hex_common (struct tep_event_format *event,struct print_arg *arg,char **tok,enum print_arg_type type) {memset (arg,0 ,sizeof (*arg));
@@ -2640,20 +2640,20 @@ process_hex_common(struct event_format *event, struct print_arg *arg, }static enum event_type -process_hex (struct event_format *event,struct print_arg *arg,char **tok) +process_hex (struct tep_event_format *event,struct print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX ); }static enum event_type -process_hex_str (struct event_format *event,struct print_arg *arg, +process_hex_str (struct tep_event_format *event,struct print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX_STR ); }static enum event_type -process_int_array (struct event_format *event,struct print_arg *arg,char **tok) +process_int_array (struct tep_event_format *event,struct print_arg *arg,char **tok) {memset (arg,0 ,sizeof (*arg)); arg->type =PRINT_INT_ARRAY ;
@@ -2681,7 +2681,7 @@ process_int_array(struct event_format *event, struct print_arg *arg, char **tok) }static enum event_type -process_dynamic_array (struct event_format *event,struct print_arg *arg,char **tok) +process_dynamic_array (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct format_field *field;enum event_type type;
@@ -2745,7 +2745,7 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char ** }static enum event_type -process_dynamic_array_len (struct event_format *event,struct print_arg *arg, +process_dynamic_array_len (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct format_field *field;
@@ -2781,7 +2781,7 @@ process_dynamic_array_len(struct event_format *event, struct print_arg *arg, }static enum event_type -process_paren (struct event_format *event,struct print_arg *arg,char **tok) +process_paren (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *item_arg;enum event_type type;
@@ -2844,7 +2844,7 @@ process_paren(struct event_format *event, struct print_arg *arg, char **tok)static enum event_type -process_str (struct event_format *event__maybe_unused ,struct print_arg *arg, +process_str (struct tep_event_format *event__maybe_unused ,struct print_arg *arg,char **tok) {enum event_type type;
@@ -2873,8 +2873,8 @@ process_str(struct event_format *event __maybe_unused, struct print_arg *arg, }static enum event_type -process_bitmask (struct event_format *event__maybe_unused ,struct print_arg *arg, -char **tok) +process_bitmask (struct tep_event_format *event__maybe_unused ,struct print_arg *arg, +char **tok) {enum event_type type;char *token;
@@ -2934,7 +2934,7 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name) }static enum event_type -process_func_handler (struct event_format *event,struct tep_function_handler *func, +process_func_handler (struct tep_event_format *event,struct tep_function_handler *func,struct print_arg *arg,char **tok) {struct print_arg **next_arg;
@@ -2992,7 +2992,7 @@ process_func_handler(struct event_format *event, struct tep_function_handler *fu }static enum event_type -process_function (struct event_format *event,struct print_arg *arg, +process_function (struct tep_event_format *event,struct print_arg *arg,char *token,char **tok) {struct tep_function_handler *func;
@@ -3048,7 +3048,7 @@ process_function(struct event_format *event, struct print_arg *arg, }static enum event_type -process_arg_token (struct event_format *event,struct print_arg *arg, +process_arg_token (struct tep_event_format *event,struct print_arg *arg,char **tok,enum event_type type) {char *token;
@@ -3136,7 +3136,7 @@ process_arg_token(struct event_format *event, struct print_arg *arg,return type; } -static int event_read_print_args (struct event_format *event,struct print_arg **list) +static int event_read_print_args (struct tep_event_format *event,struct print_arg **list) {enum event_type type =EVENT_ERROR ;struct print_arg *arg;
@@ -3194,7 +3194,7 @@ static int event_read_print_args(struct event_format *event, struct print_arg **return args; } -static int event_read_print (struct event_format *event) +static int event_read_print (struct tep_event_format *event) {enum event_type type;char *token;
@@ -3260,7 +3260,7 @@ static int event_read_print(struct event_format *event)* This only searchs the common fields and not all field. */ struct format_field * -tep_find_common_field (struct event_format *event,const char *name) +tep_find_common_field (struct tep_event_format *event,const char *name) {struct format_field *format;
@@ -3282,7 +3282,7 @@ tep_find_common_field(struct event_format *event, const char *name)* This does not search common fields. */ struct format_field * -tep_find_field (struct event_format *event,const char *name) +tep_find_field (struct tep_event_format *event,const char *name) {struct format_field *format;
@@ -3305,7 +3305,7 @@ tep_find_field(struct event_format *event, const char *name)* the non-common ones if a common one was not found. */ struct format_field * -tep_find_any_field (struct event_format *event,const char *name) +tep_find_any_field (struct tep_event_format *event,const char *name) {struct format_field *format;
@@ -3374,7 +3374,7 @@ int tep_read_number_field(struct format_field *field, const void *data,static int get_common_info (struct tep_handle *pevent,const char *type,int *offset,int *size) { -struct event_format *event; +struct tep_event_format *event;struct format_field *field;/*
@@ -3461,11 +3461,11 @@ static int events_id_cmp(const void *a, const void *b);* * Returns an event that has a given @id. */ -struct event_format *tep_find_event (struct tep_handle *pevent,int id) +struct tep_event_format *tep_find_event (struct tep_handle *pevent,int id) { -struct event_format **eventptr; -struct event_format key; -struct event_format *pkey = &key; +struct tep_event_format **eventptr; +struct tep_event_format key; +struct tep_event_format *pkey = &key;/* Check cache first */ if (pevent->last_event && pevent->last_event->id == id)
@@ -3493,11 +3493,11 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id)* This returns an event with a given @name and under the system * @sys. If @sys is NULL the first event with @name is returned. */ -struct event_format * +struct tep_event_format *tep_find_event_by_name (struct tep_handle *pevent,const char *sys,const char *name) { -struct event_format *event; +struct tep_event_format *event;int i; if (pevent->last_event &&
@@ -3522,7 +3522,7 @@ tep_find_event_by_name(struct tep_handle *pevent, }static unsigned long long -eval_num_arg (void *data,int size,struct event_format *event,struct print_arg *arg) +eval_num_arg (void *data,int size,struct tep_event_format *event,struct print_arg *arg) {struct tep_handle *pevent = event->pevent;unsigned long long val =0 ;
@@ -3862,7 +3862,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent, }static void print_str_arg (struct trace_seq *s,void *data,int size, -struct event_format *event,const char *format, +struct tep_event_format *event,const char *format,int len_arg,struct print_arg *arg) {struct tep_handle *pevent = event->pevent;
@@ -4117,7 +4117,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,static unsigned long long process_defined_func (struct trace_seq *s,void *data,int size, -struct event_format *event,struct print_arg *arg) +struct tep_event_format *event,struct print_arg *arg) {struct tep_function_handler *func_handle = arg->func.func;struct func_params *param;
@@ -4212,7 +4212,7 @@ static void free_args(struct print_arg *args) } } -static struct print_arg *make_bprint_args (char *fmt,void *data,int size,struct event_format *event) +static struct print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event_format *event) {struct tep_handle *pevent = event->pevent;struct format_field *field, *ip_field;
@@ -4389,7 +4389,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, strucstatic char *get_bprint_format (void *data,int size__maybe_unused , -struct event_format *event) +struct tep_event_format *event) {struct tep_handle *pevent = event->pevent;unsigned long long addr;
@@ -4424,7 +4424,7 @@ get_bprint_format(void *data, int size __maybe_unused, }static void print_mac_arg (struct trace_seq *s,int mac,void *data,int size, -struct event_format *event,struct print_arg *arg) +struct tep_event_format *event,struct print_arg *arg) {unsigned char *buf;const char *fmt ="%.2x:%.2x:%.2x:%.2x:%.2x:%.2x" ;
@@ -4577,7 +4577,7 @@ static void print_ip6_addr(struct trace_seq *s, char i, unsigned char *buf)* %pISpc print an IP address based on sockaddr; p adds port. */ static int print_ipv4_arg (struct trace_seq *s,const char *ptr,char i, -void *data,int size,struct event_format *event, +void *data,int size,struct tep_event_format *event,struct print_arg *arg) {unsigned char *buf;
@@ -4614,7 +4614,7 @@ static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i, }static int print_ipv6_arg (struct trace_seq *s,const char *ptr,char i, -void *data,int size,struct event_format *event, +void *data,int size,struct tep_event_format *event,struct print_arg *arg) {char have_c =0 ;
@@ -4664,7 +4664,7 @@ static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i, }static int print_ipsa_arg (struct trace_seq *s,const char *ptr,char i, -void *data,int size,struct event_format *event, +void *data,int size,struct tep_event_format *event,struct print_arg *arg) {char have_c =0 , have_p =0 ;
@@ -4746,7 +4746,7 @@ static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i, }static int print_ip_arg (struct trace_seq *s,const char *ptr, -void *data,int size,struct event_format *event, +void *data,int size,struct tep_event_format *event,struct print_arg *arg) {char i = *ptr;/* 'i' or 'I' */
@@ -4853,7 +4853,7 @@ void tep_print_field(struct trace_seq *s, void *data, }void tep_print_fields (struct trace_seq *s,void *data, -int size__maybe_unused ,struct event_format *event) +int size__maybe_unused ,struct tep_event_format *event) {struct format_field *field;
@@ -4865,7 +4865,7 @@ void tep_print_fields(struct trace_seq *s, void *data, } } -static void pretty_print (struct trace_seq *s,void *data,int size,struct event_format *event) +static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event_format *event) {struct tep_handle *pevent = event->pevent;struct print_fmt *print_fmt = &event->print_fmt;
@@ -5228,7 +5228,7 @@ int tep_data_type(struct tep_handle *pevent, struct tep_record *rec)* * This returns the event form a given @type; */ -struct event_format *tep_data_event_from_type (struct tep_handle *pevent,int type) +struct tep_event_format *tep_data_event_from_type (struct tep_handle *pevent,int type) {return tep_find_event (pevent, type); }
@@ -5386,7 +5386,7 @@ int tep_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline)* This parses the raw @data using the given @event information and * writes the print format into the trace_seq. */ -void tep_event_info (struct trace_seq *s,struct event_format *event, +void tep_event_info (struct trace_seq *s,struct tep_event_format *event,struct tep_record *record) {int print_pretty =1 ;
@@ -5427,7 +5427,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)* Returns the associated event for a given record, or NULL if non is * is found. */ -struct event_format * +struct tep_event_format *tep_find_event_by_record (struct tep_handle *pevent,struct tep_record *record) {int type;
@@ -5452,7 +5452,7 @@ tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)* Writes the tasks comm, pid and CPU to @s. */ void tep_print_event_task (struct tep_handle *pevent,struct trace_seq *s, -struct event_format *event, +struct tep_event_format *event,struct tep_record *record) {void *data = record->data;
@@ -5480,7 +5480,7 @@ void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s,* Writes the timestamp of the record into @s. */ void tep_print_event_time (struct tep_handle *pevent,struct trace_seq *s, -struct event_format *event, +struct tep_event_format *event,struct tep_record *record,bool use_trace_clock) {
@@ -5530,7 +5530,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,* Writes the parsing of the record's data to @s. */ void tep_print_event_data (struct tep_handle *pevent,struct trace_seq *s, -struct event_format *event, +struct tep_event_format *event,struct tep_record *record) {static const char *spaces =" " ;/* 20 spaces */
@@ -5549,7 +5549,7 @@ void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s,void tep_print_event (struct tep_handle *pevent,struct trace_seq *s,struct tep_record *record,bool use_trace_clock) { -struct event_format *event; +struct tep_event_format *event; event =tep_find_event_by_record (pevent, record);if (!event) {
@@ -5571,8 +5571,8 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s,static int events_id_cmp (const void *a,const void *b) { -struct event_format *const * ea = a; -struct event_format *const * eb = b; +struct tep_event_format *const * ea = a; +struct tep_event_format *const * eb = b;if ((*ea)->id < (*eb)->id)return -1 ;
@@ -5585,8 +5585,8 @@ static int events_id_cmp(const void *a, const void *b)static int events_name_cmp (const void *a,const void *b) { -struct event_format *const * ea = a; -struct event_format *const * eb = b; +struct tep_event_format *const * ea = a; +struct tep_event_format *const * eb = b;int res; res =strcmp ((*ea)->name, (*eb)->name);
@@ -5602,8 +5602,8 @@ static int events_name_cmp(const void *a, const void *b)static int events_system_cmp (const void *a,const void *b) { -struct event_format *const * ea = a; -struct event_format *const * eb = b; +struct tep_event_format *const * ea = a; +struct tep_event_format *const * eb = b;int res; res =strcmp ((*ea)->system, (*eb)->system);
@@ -5617,9 +5617,9 @@ static int events_system_cmp(const void *a, const void *b)return events_id_cmp (a, b); } -struct event_format **tep_list_events (struct tep_handle *pevent,enum event_sort_type sort_type) +struct tep_event_format **tep_list_events (struct tep_handle *pevent,enum event_sort_type sort_type) { -struct event_format **events; +struct tep_event_format **events;int (*sort)(const void *a,const void *b); events = pevent->sort_events;
@@ -5702,7 +5702,7 @@ get_event_fields(const char *type, const char *name,* Returns an allocated array of fields. The last item in the array is NULL. * The array must be freed with free(). */ -struct format_field **tep_event_common_fields (struct event_format *event) +struct format_field **tep_event_common_fields (struct tep_event_format *event) { return get_event_fields("common", event->name, event->format.nr_common,
@@ -5716,7 +5716,7 @@ struct format_field **tep_event_common_fields(struct event_format *event)* Returns an allocated array of fields. The last item in the array is NULL. * The array must be freed with free(). */ -struct format_field **tep_event_fields (struct event_format *event) +struct format_field **tep_event_fields (struct tep_event_format *event) { return get_event_fields("event", event->name, event->format.nr_fields,
@@ -5958,7 +5958,7 @@ int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long sireturn 0 ; } -static int event_matches (struct event_format *event, +static int event_matches (struct tep_event_format *event,int id,const char *sys_name,const char *event_name) {
@@ -5981,7 +5981,7 @@ static void free_handler(struct event_handler *handle)free (handle); } -static int find_event_handle (struct tep_handle *pevent,struct event_format *event) +static int find_event_handle (struct tep_handle *pevent,struct tep_event_format *event) {struct event_handler *handle, **next;
@@ -6022,11 +6022,11 @@ static int find_event_handle(struct tep_handle *pevent, struct event_format *eve* * /sys/kernel/debug/tracing/events/.../.../format */ -enum tep_errno __tep_parse_format (struct event_format **eventp, +enum tep_errno __tep_parse_format (struct tep_event_format **eventp,struct tep_handle *pevent,const char *buf,unsigned long size,const char *sys) { -struct event_format *event; +struct tep_event_format *event;int ret;init_input_buf (buf, size);
@@ -6131,12 +6131,12 @@ enum tep_errno __tep_parse_format(struct event_format **eventp,static enum tep_errno __parse_event (struct tep_handle *pevent, -struct event_format **eventp, +struct tep_event_format **eventp,const char *buf,unsigned long size,const char *sys) {int ret =__tep_parse_format (eventp, pevent, buf, size, sys); -struct event_format *event = *eventp; +struct tep_event_format *event = *eventp;if (event ==NULL )return ret;
@@ -6173,7 +6173,7 @@ __parse_event(struct tep_handle *pevent,* /sys/kernel/debug/tracing/events/.../.../format */ enum tep_errno tep_parse_format (struct tep_handle *pevent, -struct event_format **eventp, +struct tep_event_format **eventp,const char *buf,unsigned long size,const char *sys) {
@@ -6197,7 +6197,7 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent,enum tep_errno tep_parse_event (struct tep_handle *pevent,const char *buf,unsigned long size,const char *sys) { -struct event_format *event =NULL ; +struct tep_event_format *event =NULL ;return __parse_event (pevent, &event, buf, size, sys); }
@@ -6263,7 +6263,7 @@ int get_field_val(struct trace_seq *s, struct format_field *field,* * On failure, it returns NULL. */ -void *tep_get_field_raw (struct trace_seq *s,struct event_format *event, +void *tep_get_field_raw (struct trace_seq *s,struct tep_event_format *event,const char *name,struct tep_record *record,int *len,int err) {
@@ -6310,7 +6310,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct event_format *event,* * Returns 0 on success -1 on field not found. */ -int tep_get_field_val (struct trace_seq *s,struct event_format *event, +int tep_get_field_val (struct trace_seq *s,struct tep_event_format *event,const char *name,struct tep_record *record,unsigned long long *val,int err) {
@@ -6335,7 +6335,7 @@ int tep_get_field_val(struct trace_seq *s, struct event_format *event,* * Returns 0 on success -1 on field not found. */ -int tep_get_common_field_val (struct trace_seq *s,struct event_format *event, +int tep_get_common_field_val (struct trace_seq *s,struct tep_event_format *event,const char *name,struct tep_record *record,unsigned long long *val,int err) {
@@ -6360,7 +6360,7 @@ int tep_get_common_field_val(struct trace_seq *s, struct event_format *event,* * Returns 0 on success -1 on field not found. */ -int tep_get_any_field_val (struct trace_seq *s,struct event_format *event, +int tep_get_any_field_val (struct trace_seq *s,struct tep_event_format *event,const char *name,struct tep_record *record,unsigned long long *val,int err) {
@@ -6386,7 +6386,7 @@ int tep_get_any_field_val(struct trace_seq *s, struct event_format *event,* Returns: 0 on success, -1 field not found, or 1 if buffer is full. */ int tep_print_num_field (struct trace_seq *s,const char *fmt, -struct event_format *event,const char *name, +struct tep_event_format *event,const char *name,struct tep_record *record,int err) {struct format_field *field =tep_find_field (event, name);
@@ -6418,7 +6418,7 @@ int tep_print_num_field(struct trace_seq *s, const char *fmt,* Returns: 0 on success, -1 field not found, or 1 if buffer is full. */ int tep_print_func_field (struct trace_seq *s,const char *fmt, -struct event_format *event,const char *name, +struct tep_event_format *event,const char *name,struct tep_record *record,int err) {struct format_field *field =tep_find_field (event, name);
@@ -6578,11 +6578,11 @@ int tep_unregister_print_function(struct tep_handle *pevent,return -1 ; } -static struct event_format *search_event (struct tep_handle *pevent,int id, +static struct tep_event_format *search_event (struct tep_handle *pevent,int id,const char *sys_name,const char *event_name) { -struct event_format *event; +struct tep_event_format *event;if (id >=0 ) {/* search by id */
@@ -6622,7 +6622,7 @@ int tep_register_event_handler(struct tep_handle *pevent, int id, const char *sys_name, const char *event_name, tep_event_handler_func func, void *context) { - struct event_format *event; + struct tep_event_format *event;struct event_handler *handle; event =search_event (pevent, id, sys_name, event_name);
@@ -6706,7 +6706,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id, const char *sys_name, const char *event_name, tep_event_handler_func func, void *context) { - struct event_format *event; + struct tep_event_format *event;struct event_handler *handle;struct event_handler **next;
@@ -6784,7 +6784,7 @@ static void free_formats(struct format *format)free_format_fields (format->fields); } -void tep_free_format (struct event_format *event) +void tep_free_format (struct tep_event_format *event) {free (event->name);free (event->system);
tools/lib/traceevent/event-parse.h +33 -33
172 lines not on this page · raw message
tools/lib/traceevent/parse-filter.c +21 -21
162 lines not on this page · raw message
tools/lib/traceevent/plugin_function.c +1 -1
@@ -124,7 +124,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu) }static int function_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {struct tep_handle *pevent = event->pevent;unsigned long long function;
tools/lib/traceevent/plugin_hrtimer.c +2 -2
@@ -27,7 +27,7 @@static int timer_expire_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {trace_seq_printf (s,"hrtimer=" );
@@ -47,7 +47,7 @@ static int timer_expire_handler(struct trace_seq *s,static int timer_start_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {trace_seq_printf (s,"hrtimer=" );
tools/lib/traceevent/plugin_kmem.c +1 -1
@@ -25,7 +25,7 @@#include "trace-seq.h" static int call_site_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {struct format_field *field;unsigned long long val, addr;
tools/lib/traceevent/plugin_kvm.c +7 -7
@@ -249,7 +249,7 @@ static const char *find_exit_reason(unsigned isa, int val) }static int print_exit_reason (struct trace_seq *s,struct tep_record *record, -struct event_format *event,const char *field) +struct tep_event_format *event,const char *field) {unsigned long long isa;unsigned long long val;
@@ -270,7 +270,7 @@ static int print_exit_reason(struct trace_seq *s, struct tep_record *record, }static int kvm_exit_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {unsigned long long info1 =0 , info2 =0 ;
@@ -293,7 +293,7 @@ static int kvm_exit_handler(struct trace_seq *s, struct tep_record *record,static int kvm_emulate_insn_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {unsigned long long rip, csbase, len, flags, failed;int llen;
@@ -332,7 +332,7 @@ static int kvm_emulate_insn_handler(struct trace_seq *s,static int kvm_nested_vmexit_inject_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {if (print_exit_reason (s, record, event,"exit_code" ) <0 )return -1 ;
@@ -346,7 +346,7 @@ static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct tep_reco }static int kvm_nested_vmexit_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {tep_print_num_field (s,"rip %llx " , event,"rip" , record,1 );
@@ -372,7 +372,7 @@ union kvm_mmu_page_role { };static int kvm_mmu_print_role (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {unsigned long long val;static const char *access_str[] = {
@@ -419,7 +419,7 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,static int kvm_mmu_get_page_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {unsigned long long val;
tools/lib/traceevent/plugin_mac80211.c +2 -2
@@ -26,7 +26,7 @@#define INDENT 65 -static void print_string (struct trace_seq *s,struct event_format *event, +static void print_string (struct trace_seq *s,struct tep_event_format *event,const char *name,const void *data) {struct format_field *f =tep_find_field (event, name);
@@ -60,7 +60,7 @@ static void print_string(struct trace_seq *s, struct event_format *event,static int drv_bss_info_changed (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {void *data = record->data;
tools/lib/traceevent/plugin_sched_switch.c +2 -2
@@ -67,7 +67,7 @@ static void write_and_save_comm(struct format_field *field,static int sched_wakeup_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {struct format_field *field;unsigned long long val;
@@ -96,7 +96,7 @@ static int sched_wakeup_handler(struct trace_seq *s,static int sched_switch_handler (struct trace_seq *s,struct tep_record *record, -struct event_format *event,void *context) +struct tep_event_format *event,void *context) {struct format_field *field;unsigned long long val;
tools/perf/builtin-trace.c +1 -1
@@ -862,7 +862,7 @@ static struct syscall_fmt *syscall_fmt__find(const char *name)* args_size: sum of the sizes of the syscall arguments, anything after that is augmented stuff: pathname for openat, etc. */ struct syscall { -struct event_format *tp_format; +struct tep_event_format *tp_format;int nr_args;int args_size;bool is_exit;
tools/perf/util/evsel.h +2 -2
@@ -102,7 +102,7 @@ struct perf_evsel {char *name;double scale;const char *unit; -struct event_format *tp_format; +struct tep_event_format *tp_format;off_t id_offset;struct perf_stat_evsel *stats;void *priv;
@@ -211,7 +211,7 @@ static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *struct perf_evsel *perf_evsel__new_cycles (bool precise); -struct event_format *event_format__new (const char *sys,const char *name); +struct tep_event_format *event_format__new (const char *sys,const char *name);void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr,int idx);
tools/perf/util/header.c +1 -1
@@ -3206,7 +3206,7 @@ static int read_attr(int fd, struct perf_header *ph,static int perf_evsel__prepare_tracepoint_event (struct perf_evsel *evsel,struct tep_handle *pevent) { -struct event_format *event; +struct tep_event_format *event;char bf[128 ];/* already prepared */
tools/perf/util/python.c +2 -2
@@ -386,7 +386,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)struct format_field *field;if (!evsel->tp_format) { -struct event_format *tp_format; +struct tep_event_format *tp_format; tp_format =trace_event__tp_format_id (evsel->attr.config);if (!tp_format)
@@ -1240,7 +1240,7 @@ static struct {static PyObject *pyrf__tracepoint (struct pyrf_evsel *pevsel,PyObject *args,PyObject *kwargs) { -struct event_format *tp_format; +struct tep_event_format *tp_format;static char *kwlist[] = {"sys" ,"name" ,NULL };char *sys =NULL ;char *name =NULL ;
tools/perf/util/scripting-engines/trace-event-perl.c +3 -3
@@ -189,7 +189,7 @@ static void define_flag_field(const char *ev_name,LEAVE ; } -static void define_event_symbols (struct event_format *event, +static void define_event_symbols (struct tep_event_format *event,const char *ev_name,struct print_arg *args) {
@@ -338,7 +338,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, struct addr_location *al) {struct thread *thread = al->thread; -struct event_format *event = evsel->tp_format; +struct tep_event_format *event = evsel->tp_format;struct format_field *field;static char handler[256 ];unsigned long long val;
@@ -537,7 +537,7 @@ static int perl_stop_script(void)static int perl_generate_script (struct tep_handle *pevent,const char *outfile) { -struct event_format *event =NULL ; +struct tep_event_format *event =NULL ;struct format_field *f;char fname[PATH_MAX ];int not_first, count;
tools/perf/util/scripting-engines/trace-event-python.c +4 -4
@@ -264,7 +264,7 @@ static void define_field(enum print_arg_type field_type,Py_DECREF (t); } -static void define_event_symbols (struct event_format *event, +static void define_event_symbols (struct tep_event_format *event,const char *ev_name,struct print_arg *args) {
@@ -332,7 +332,7 @@ static void define_event_symbols(struct event_format *event,define_event_symbols (event, ev_name, args->next); } -static PyObject *get_field_numeric_entry (struct event_format *event, +static PyObject *get_field_numeric_entry (struct tep_event_format *event,struct format_field *field,void *data) {bool is_array = field->flags &FIELD_IS_ARRAY ;
@@ -790,7 +790,7 @@ static void python_process_tracepoint(struct perf_sample *sample,struct perf_evsel *evsel, struct addr_location *al) { - struct event_format *event = evsel->tp_format; + struct tep_event_format *event = evsel->tp_format;PyObject *handler, *context, *t, *obj =NULL , *callchain;PyObject *dict =NULL , *all_entries_dict =NULL ;static char handler_name[256 ];
@@ -1590,7 +1590,7 @@ static int python_stop_script(void)static int python_generate_script (struct tep_handle *pevent,const char *outfile) { -struct event_format *event =NULL ; +struct tep_event_format *event =NULL ;struct format_field *f;char fname[PATH_MAX ];int not_first, count;
tools/perf/util/trace-event-parse.c +7 -7
@@ -33,7 +33,7 @@ static int get_common_field(struct scripting_context *context, int *offset, int *size, const char *type) { struct tep_handle *pevent = context->pevent; -struct event_format *event; +struct tep_event_format *event;struct format_field *field;if (!*size) {
@@ -94,7 +94,7 @@ int common_pc(struct scripting_context *context) }unsigned long long -raw_field_value (struct event_format *event,const char *name,void *data) +raw_field_value (struct tep_event_format *event,const char *name,void *data) {struct format_field *field;unsigned long long val;
@@ -108,12 +108,12 @@ raw_field_value(struct event_format *event, const char *name, void *data)return val; } -unsigned long long read_size (struct event_format *event,void *ptr,int size) +unsigned long long read_size (struct tep_event_format *event,void *ptr,int size) {return tep_read_number (event->pevent, ptr, size); } -void event_format__fprintf (struct event_format *event, +void event_format__fprintf (struct tep_event_format *event,int cpu,void *data,int size,FILE *fp) {struct tep_record record;
@@ -130,7 +130,7 @@ void event_format__fprintf(struct event_format *event,trace_seq_destroy (&s); } -void event_format__print (struct event_format *event, +void event_format__print (struct tep_event_format *event,int cpu,void *data,int size) {return event_format__fprintf (event, cpu, data, size, stdout);
@@ -188,8 +188,8 @@ int parse_event_file(struct tep_handle *pevent,return tep_parse_event (pevent, buf, size, sys); } -struct event_format *trace_find_next_event (struct tep_handle *pevent, -struct event_format *event) +struct tep_event_format *trace_find_next_event (struct tep_handle *pevent, +struct tep_event_format *event) {static int idx;
tools/perf/util/trace-event.c +4 -4
@@ -72,12 +72,12 @@ void trace_event__cleanup(struct trace_event *t)/* * Returns pointer with encoded error via <linux/err.h> interface. */ -static struct event_format * +static struct tep_event_format *tp_format (const char *sys,const char *name) {char *tp_dir =get_events_file (sys);struct tep_handle *pevent = tevent.pevent; -struct event_format *event =NULL ; +struct tep_event_format *event =NULL ;char path[PATH_MAX ];size_t size;char *data;
@@ -102,7 +102,7 @@ tp_format(const char *sys, const char *name)/* * Returns pointer with encoded error via <linux/err.h> interface. */ -struct event_format * +struct tep_event_format *trace_event__tp_format (const char *sys,const char *name) {if (!tevent_initialized &&trace_event__init2 ())
@@ -111,7 +111,7 @@ trace_event__tp_format(const char *sys, const char *name)return tp_format (sys, name); } -struct event_format *trace_event__tp_format_id (int id) +struct tep_event_format *trace_event__tp_format_id (int id) {if (!tevent_initialized &&trace_event__init2 ())return ERR_PTR (-ENOMEM );
tools/perf/util/trace-event.h +8 -8
@@ -22,17 +22,17 @@ int trace_event__init(struct trace_event *t);void trace_event__cleanup (struct trace_event *t);int trace_event__register_resolver (struct machine *machine,tep_func_resolver_t *func); -struct event_format * +struct tep_event_format *trace_event__tp_format (const char *sys,const char *name); -struct event_format *trace_event__tp_format_id (int id); +struct tep_event_format *trace_event__tp_format_id (int id);int bigendian (void ); -void event_format__fprintf (struct event_format *event, +void event_format__fprintf (struct tep_event_format *event,int cpu,void *data,int size,FILE *fp); -void event_format__print (struct event_format *event, +void event_format__print (struct tep_event_format *event,int cpu,void *data,int size);int parse_ftrace_file (struct tep_handle *pevent,char *buf,unsigned long size);
@@ -40,7 +40,7 @@ int parse_event_file(struct tep_handle *pevent, char *buf, unsigned long size, char *sys);unsigned long long -raw_field_value (struct event_format *event,const char *name,void *data); +raw_field_value (struct tep_event_format *event,const char *name,void *data);void parse_proc_kallsyms (struct tep_handle *pevent,char *file,unsigned int size);void parse_ftrace_printk (struct tep_handle *pevent,char *file,unsigned int size);
@@ -48,9 +48,9 @@ void parse_saved_cmdline(struct tep_handle *pevent, char *file, unsigned int sizssize_t trace_report (int fd,struct trace_event *tevent,bool repipe); -struct event_format *trace_find_next_event (struct tep_handle *pevent, -struct event_format *event); -unsigned long long read_size (struct event_format *event,void *ptr,int size); +struct tep_event_format *trace_find_next_event (struct tep_handle *pevent, +struct tep_event_format *event); +unsigned long long read_size (struct tep_event_format *event,void *ptr,int size);unsigned long long eval_flag (const char *flag);int read_tracing_data (int fd,struct list_head *pattrs);
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 7/27 tools lib traceevent, perf tools: Rename struct format{_field} to struct tep_format{_field}
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames struct format to struct tep_format and struct format_field to struct tep_format_field
--- tools/lib/traceevent/event-parse.c | 82 +++++++++++----------- tools/lib/traceevent/event-parse.h | 42 +++++------ tools/lib/traceevent/parse-filter.c | 8 +-- tools/lib/traceevent/plugin_kmem.c | 2 +- tools/lib/traceevent/plugin_mac80211.c | 2 +- tools/lib/traceevent/plugin_sched_switch.c | 6 +- tools/perf/builtin-trace.c | 14 ++-- tools/perf/tests/evsel-tp-sched.c | 2 +- tools/perf/util/data-convert-bt.c | 22 +++--- tools/perf/util/evsel.c | 8 +-- tools/perf/util/evsel.h | 6 +- tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/python.c | 4 +- .../perf/util/scripting-engines/trace-event-perl.c | 4 +- .../util/scripting-engines/trace-event-python.c | 6 +- tools/perf/util/sort.c | 18 ++--- tools/perf/util/trace-event-parse.c | 4 +- 17 files changed, 116 insertions(+), 116 deletions(-)
tools/lib/traceevent/event-parse.c +41 -41
@@ -1299,7 +1299,7 @@ static int event_read_id(void)return -1 ; } -static int field_is_string (struct format_field *field) +static int field_is_string (struct tep_format_field *field) { if ((field->flags & FIELD_IS_ARRAY) && (strstr(field->type, "char") || strstr(field->type, "u8") ||
@@ -1309,7 +1309,7 @@ static int field_is_string(struct format_field *field)return 0 ; } -static int field_is_dynamic (struct format_field *field) +static int field_is_dynamic (struct tep_format_field *field) {if (strncmp (field->type,"__data_loc" ,10 ) ==0 )return 1 ;
@@ -1317,7 +1317,7 @@ static int field_is_dynamic(struct format_field *field)return 0 ; } -static int field_is_long (struct format_field *field) +static int field_is_long (struct tep_format_field *field) {/* includes long long */ if (strstr (field->type,"long" ))
@@ -1354,9 +1354,9 @@ static unsigned int type_size(const char *name)return 0 ; } -static int event_read_fields (struct tep_event_format *event,struct format_field **fields) +static int event_read_fields (struct tep_event_format *event,struct tep_format_field **fields) { -struct format_field *field =NULL ; +struct tep_format_field *field =NULL ;enum event_type type;char *token;char *last_token;
@@ -2683,7 +2683,7 @@ process_int_array(struct tep_event_format *event, struct print_arg *arg, char **static enum event_type process_dynamic_array (struct tep_event_format *event,struct print_arg *arg,char **tok) { -struct format_field *field; +struct tep_format_field *field;enum event_type type;char *token;
@@ -2748,7 +2748,7 @@ static enum event_type process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, char **tok) { - struct format_field *field; + struct tep_format_field *field;enum event_type type;char *token;
@@ -3259,10 +3259,10 @@ static int event_read_print(struct tep_event_format *event)* Returns a common field from the event by the given @name. * This only searchs the common fields and not all field. */ -struct format_field * +struct tep_format_field *tep_find_common_field (struct tep_event_format *event,const char *name) { -struct format_field *format; +struct tep_format_field *format;for (format = event->format.common_fields; format; format = format->next) {
@@ -3281,10 +3281,10 @@ tep_find_common_field(struct tep_event_format *event, const char *name)* Returns a non-common field by the given @name. * This does not search common fields. */ -struct format_field * +struct tep_format_field *tep_find_field (struct tep_event_format *event,const char *name) { -struct format_field *format; +struct tep_format_field *format;for (format = event->format.fields; format; format = format->next) {
@@ -3304,10 +3304,10 @@ tep_find_field(struct tep_event_format *event, const char *name)* This searchs the common field names first, then * the non-common ones if a common one was not found. */ -struct format_field * +struct tep_format_field *tep_find_any_field (struct tep_event_format *event,const char *name) { -struct format_field *format; +struct tep_format_field *format; format =tep_find_common_field (event, name);if (format)
@@ -3353,7 +3353,7 @@ unsigned long long tep_read_number(struct tep_handle *pevent,* * Returns 0 on success, -1 otherwise. */ -int tep_read_number_field (struct format_field *field,const void *data, +int tep_read_number_field (struct tep_format_field *field,const void *data,unsigned long long *value) {if (!field)
@@ -3375,7 +3375,7 @@ static int get_common_info(struct tep_handle *pevent, const char *type, int *offset, int *size) { struct tep_event_format *event; -struct format_field *field; +struct tep_format_field *field;/* * All events should have the same common elements.
@@ -3867,7 +3867,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, {struct tep_handle *pevent = event->pevent;struct print_flag_sym *flag; -struct format_field *field; +struct tep_format_field *field;struct printk_map *printk;long long val, fval;unsigned long long addr;
@@ -4008,7 +4008,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,if (arg->int_array.field->type ==PRINT_DYNAMIC_ARRAY ) {unsigned long offset; -struct format_field *field = +struct tep_format_field *field = arg->int_array.field->dynarray.field; offset = tep_read_number(pevent, data + field->offset,
@@ -4056,7 +4056,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,int str_offset;if (arg->string.offset ==-1 ) { -struct format_field *f; +struct tep_format_field *f; f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset;
@@ -4074,7 +4074,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,int bitmask_size;if (arg->bitmask.offset ==-1 ) { -struct format_field *f; +struct tep_format_field *f; f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset;
@@ -4215,7 +4215,7 @@ static void free_args(struct print_arg *args)static struct print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event_format *event) {struct tep_handle *pevent = event->pevent; -struct format_field *field, *ip_field; +struct tep_format_field *field, *ip_field;struct print_arg *args, *arg, **next;unsigned long long ip, val;char *ptr;
@@ -4393,7 +4393,7 @@ get_bprint_format(void *data, int size __maybe_unused, {struct tep_handle *pevent = event->pevent;unsigned long long addr; -struct format_field *field; +struct tep_format_field *field;struct printk_map *printk;char *format;
@@ -4788,7 +4788,7 @@ static int is_printable_array(char *p, unsigned int len) }void tep_print_field (struct trace_seq *s,void *data, -struct format_field *field) +struct tep_format_field *field) {unsigned long long val;unsigned int offset, len, i;
@@ -4855,7 +4855,7 @@ void tep_print_field(struct trace_seq *s, void *data,void tep_print_fields (struct trace_seq *s,void *data,int size__maybe_unused ,struct tep_event_format *event) { -struct format_field *field; +struct tep_format_field *field; field = event->format.fields;while (field) {
@@ -5664,12 +5664,12 @@ struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_return events; } -static struct format_field ** +static struct tep_format_field **get_event_fields (const char *type,const char *name, -int count,struct format_field *list) +int count,struct tep_format_field *list) { -struct format_field **fields; -struct format_field *field; +struct tep_format_field **fields; +struct tep_format_field *field;int i =0 ; fields =malloc (sizeof (*fields) * (count +1 ));
@@ -5702,7 +5702,7 @@ get_event_fields(const char *type, const char *name,* Returns an allocated array of fields. The last item in the array is NULL. * The array must be freed with free(). */ -struct format_field **tep_event_common_fields (struct tep_event_format *event) +struct tep_format_field **tep_event_common_fields (struct tep_event_format *event) { return get_event_fields("common", event->name, event->format.nr_common,
@@ -5716,7 +5716,7 @@ struct format_field **tep_event_common_fields(struct tep_event_format *event)* Returns an allocated array of fields. The last item in the array is NULL. * The array must be freed with free(). */ -struct format_field **tep_event_fields (struct tep_event_format *event) +struct tep_format_field **tep_event_fields (struct tep_event_format *event) { return get_event_fields("event", event->name, event->format.nr_fields,
@@ -6090,7 +6090,7 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp, }if (!ret && (event->flags &EVENT_FL_ISFTRACE )) { -struct format_field *field; +struct tep_format_field *field;struct print_arg *arg, **list;/* old ftrace had no args */
@@ -6230,7 +6230,7 @@ int tep_strerror(struct tep_handle *pevent __maybe_unused,return 0 ; } -int get_field_val (struct trace_seq *s,struct format_field *field, +int get_field_val (struct trace_seq *s,struct tep_format_field *field,const char *name,struct tep_record *record,unsigned long long *val,int err) {
@@ -6267,7 +6267,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event, const char *name, struct tep_record *record, int *len, int err) { - struct format_field *field; + struct tep_format_field *field;void *data = record->data;unsigned offset;int dummy;
@@ -6314,7 +6314,7 @@ int tep_get_field_val(struct trace_seq *s, struct tep_event_format *event, const char *name, struct tep_record *record, unsigned long long *val, int err) { - struct format_field *field; + struct tep_format_field *field;if (!event)return -1 ;
@@ -6339,7 +6339,7 @@ int tep_get_common_field_val(struct trace_seq *s, struct tep_event_format *event const char *name, struct tep_record *record, unsigned long long *val, int err) { - struct format_field *field; + struct tep_format_field *field;if (!event)return -1 ;
@@ -6364,7 +6364,7 @@ int tep_get_any_field_val(struct trace_seq *s, struct tep_event_format *event, const char *name, struct tep_record *record, unsigned long long *val, int err) { - struct format_field *field; + struct tep_format_field *field;if (!event)return -1 ;
@@ -6389,7 +6389,7 @@ int tep_print_num_field(struct trace_seq *s, const char *fmt, struct tep_event_format *event, const char *name, struct tep_record *record, int err) { - struct format_field *field = tep_find_field(event, name); + struct tep_format_field *field = tep_find_field(event, name);unsigned long long val;if (!field)
@@ -6421,7 +6421,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_event_format *event, const char *name, struct tep_record *record, int err) { - struct format_field *field = tep_find_field(event, name); + struct tep_format_field *field = tep_find_field(event, name);struct tep_handle *pevent = event->pevent;unsigned long long val;struct func_map *func;
@@ -6758,7 +6758,7 @@ void tep_ref(struct tep_handle *pevent) pevent->ref_count++; } -void tep_free_format_field (struct format_field *field) +void tep_free_format_field (struct tep_format_field *field) {free (field->type);if (field->alias != field->name)
@@ -6767,9 +6767,9 @@ void tep_free_format_field(struct format_field *field)free (field); } -static void free_format_fields (struct format_field *field) +static void free_format_fields (struct tep_format_field *field) { -struct format_field *next; +struct tep_format_field *next;while (field) { next = field->next;
@@ -6778,7 +6778,7 @@ static void free_format_fields(struct format_field *field) } } -static void free_formats (struct format *format) +static void free_formats (struct tep_format *format) {free_format_fields (format->common_fields);free_format_fields (format->fields);
tools/lib/traceevent/event-parse.h +21 -21
121 lines not on this page · raw message
tools/lib/traceevent/parse-filter.c +4 -4
@@ -16,11 +16,11 @@#define COMM "COMM"#define CPU "CPU" -static struct format_field comm = { +static struct tep_format_field comm = { .name ="COMM" , }; -static struct format_field cpu = { +static struct tep_format_field cpu = { .name ="CPU" , };
@@ -336,7 +336,7 @@ static enum tep_errno create_arg_item(struct tep_event_format *event, const char *token, enum event_type type, struct filter_arg **parg, char *error_str) { - struct format_field *field; + struct tep_format_field *field;struct filter_arg *arg; arg =allocate_arg ();
@@ -1698,7 +1698,7 @@ get_comm(struct tep_event_format *event, struct tep_record *record)static unsigned long long get_value (struct tep_event_format *event, -struct format_field *field,struct tep_record *record) +struct tep_format_field *field,struct tep_record *record) {unsigned long long val;
tools/lib/traceevent/plugin_kmem.c +1 -1
@@ -27,7 +27,7 @@static int call_site_handler (struct trace_seq *s,struct tep_record *record,struct tep_event_format *event,void *context) { -struct format_field *field; +struct tep_format_field *field;unsigned long long val, addr;void *data = record->data;const char *func;
tools/lib/traceevent/plugin_mac80211.c +1 -1
@@ -29,7 +29,7 @@static void print_string (struct trace_seq *s,struct tep_event_format *event,const char *name,const void *data) { -struct format_field *f =tep_find_field (event, name); +struct tep_format_field *f =tep_find_field (event, name);int offset;int length;
tools/lib/traceevent/plugin_sched_switch.c +3 -3
@@ -45,7 +45,7 @@ static void write_state(struct trace_seq *s, int val)trace_seq_putc (s,'R' ); } -static void write_and_save_comm (struct format_field *field, +static void write_and_save_comm (struct tep_format_field *field,struct tep_record *record,struct trace_seq *s,int pid) {
@@ -69,7 +69,7 @@ static int sched_wakeup_handler(struct trace_seq *s,struct tep_record *record, struct tep_event_format *event, void *context) { - struct format_field *field; + struct tep_format_field *field;unsigned long long val;if (tep_get_field_val (s, event,"pid" , record, &val,1 ))
@@ -98,7 +98,7 @@ static int sched_switch_handler(struct trace_seq *s,struct tep_record *record, struct tep_event_format *event, void *context) { - struct format_field *field; + struct tep_format_field *field;unsigned long long val;if (tep_get_field_val (s, event,"prev_pid" , record, &val,1 ))
tools/perf/builtin-trace.c +7 -7
@@ -181,7 +181,7 @@ static int __tp_field__init_uint(struct tp_field *field, int size, int offset, breturn 0 ; } -static int tp_field__init_uint (struct tp_field *field,struct format_field *format_field,bool needs_swap) +static int tp_field__init_uint (struct tp_field *field,struct tep_format_field *format_field,bool needs_swap) {return __tp_field__init_uint (field, format_field->size, format_field->offset, needs_swap); }
@@ -198,7 +198,7 @@ static int __tp_field__init_ptr(struct tp_field *field, int offset)return 0 ; } -static int tp_field__init_ptr (struct tp_field *field,struct format_field *format_field) +static int tp_field__init_ptr (struct tp_field *field,struct tep_format_field *format_field) {return __tp_field__init_ptr (field, format_field->offset); }
@@ -214,7 +214,7 @@ static int perf_evsel__init_tp_uint_field(struct perf_evsel *evsel,struct tp_field *field, const char *name) { - struct format_field *format_field = perf_evsel__field(evsel, name); + struct tep_format_field *format_field = perf_evsel__field(evsel, name);if (format_field ==NULL )return -1 ;
@@ -230,7 +230,7 @@ static int perf_evsel__init_tp_ptr_field(struct perf_evsel *evsel,struct tp_field *field, const char *name) { - struct format_field *format_field = perf_evsel__field(evsel, name); + struct tep_format_field *format_field = perf_evsel__field(evsel, name);if (format_field ==NULL )return -1 ;
@@ -867,7 +867,7 @@ struct syscall {int args_size;bool is_exit;bool is_open; -struct format_field *args; +struct tep_format_field *args;const char *name;struct syscall_fmt *fmt;struct syscall_arg_fmt *arg_fmt;
@@ -1279,7 +1279,7 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args)static int syscall__set_arg_fmts (struct syscall *sc) { -struct format_field *field, *last_field =NULL ; +struct tep_format_field *field, *last_field =NULL ;int idx =0 , len;for (field = sc->args; field; field = field->next, ++idx) {
@@ -1525,7 +1525,7 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, ttrace->ret_scnprintf =NULL ;if (sc->args !=NULL ) { -struct format_field *field; +struct tep_format_field *field;for (field = sc->args; field; field = field->next, ++arg.idx, bit <<=1 ) {
tools/perf/tests/evsel-tp-sched.c +1 -1
@@ -8,7 +8,7 @@static int perf_evsel__test_field (struct perf_evsel *evsel,const char *name,int size,bool should_be_signed) { -struct format_field *field =perf_evsel__field (evsel, name); +struct tep_format_field *field =perf_evsel__field (evsel, name);int is_signed;int ret =0 ;
tools/perf/util/data-convert-bt.c +11 -11
@@ -182,7 +182,7 @@ value_set_string(struct ctf_writer *cw, struct bt_ctf_event *event, }static struct bt_ctf_field_type * -get_tracepoint_field_type (struct ctf_writer *cw,struct format_field *field) +get_tracepoint_field_type (struct ctf_writer *cw,struct tep_format_field *field) {unsigned long flags = field->flags;
@@ -287,7 +287,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,struct bt_ctf_event_class *event_class, struct bt_ctf_event *event, struct perf_sample *sample, - struct format_field *fmtf) + struct tep_format_field *fmtf) { struct bt_ctf_field_type *type;struct bt_ctf_field *array_field;
@@ -396,10 +396,10 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,static int add_tracepoint_fields_values (struct ctf_writer *cw,struct bt_ctf_event_class *event_class,struct bt_ctf_event *event, -struct format_field *fields, +struct tep_format_field *fields,struct perf_sample *sample) { -struct format_field *field; +struct tep_format_field *field;int ret;for (field = fields; field; field = field->next) {
@@ -417,8 +417,8 @@ static int add_tracepoint_values(struct ctf_writer *cw,struct perf_evsel *evsel, struct perf_sample *sample) { - struct format_field *common_fields = evsel->tp_format->format.common_fields; -struct format_field *fields = evsel->tp_format->format.fields; + struct tep_format_field *common_fields = evsel->tp_format->format.common_fields; +struct tep_format_field *fields = evsel->tp_format->format.fields;int ret; ret = add_tracepoint_fields_values(cw, event_class, event,
@@ -970,7 +970,7 @@ static char *change_name(char *name, char *orig_name, int dup)static int event_class_add_field (struct bt_ctf_event_class *event_class,struct bt_ctf_field_type *type, -struct format_field *field) +struct tep_format_field *field) {struct bt_ctf_field_type *t =NULL ;char *name;
@@ -1009,10 +1009,10 @@ static int event_class_add_field(struct bt_ctf_event_class *event_class, }static int add_tracepoint_fields_types (struct ctf_writer *cw, -struct format_field *fields, +struct tep_format_field *fields,struct bt_ctf_event_class *event_class) { -struct format_field *field; +struct tep_format_field *field;int ret;for (field = fields; field; field = field->next) {
@@ -1055,8 +1055,8 @@ static int add_tracepoint_types(struct ctf_writer *cw,struct perf_evsel *evsel, struct bt_ctf_event_class *class) { - struct format_field *common_fields = evsel->tp_format->format.common_fields; -struct format_field *fields = evsel->tp_format->format.fields; + struct tep_format_field *common_fields = evsel->tp_format->format.common_fields; +struct tep_format_field *fields = evsel->tp_format->format.fields;int ret; ret =add_tracepoint_fields_types (cw, common_fields, class);
tools/perf/util/evsel.c +4 -4
@@ -2682,7 +2682,7 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type,return 0 ; } -struct format_field *perf_evsel__field (struct perf_evsel *evsel,const char *name) +struct tep_format_field *perf_evsel__field (struct perf_evsel *evsel,const char *name) {return tep_find_field (evsel->tp_format, name); }
@@ -2690,7 +2690,7 @@ struct format_field *perf_evsel__field(struct perf_evsel *evsel, const char *namvoid *perf_evsel__rawptr (struct perf_evsel *evsel,struct perf_sample *sample,const char *name) { -struct format_field *field =perf_evsel__field (evsel, name); +struct tep_format_field *field =perf_evsel__field (evsel, name);int offset;if (!field)
@@ -2706,7 +2706,7 @@ void *perf_evsel__rawptr(struct perf_evsel *evsel, struct perf_sample *sample,return sample->raw_data + offset; } -u64 format_field__intval (struct format_field *field,struct perf_sample *sample, +u64 format_field__intval (struct tep_format_field *field,struct perf_sample *sample,bool needs_swap) {u64 value;
@@ -2748,7 +2748,7 @@ u64 format_field__intval(struct format_field *field, struct perf_sample *sample,u64 perf_evsel__intval (struct perf_evsel *evsel,struct perf_sample *sample,const char *name) { -struct format_field *field =perf_evsel__field (evsel, name); +struct tep_format_field *field =perf_evsel__field (evsel, name);if (!field)return 0 ;
tools/perf/util/evsel.h +3 -3
@@ -296,11 +296,11 @@ static inline char *perf_evsel__strval(struct perf_evsel *evsel,return perf_evsel__rawptr (evsel, sample, name); } -struct format_field ; +struct tep_format_field ; -u64 format_field__intval (struct format_field *field,struct perf_sample *sample,bool needs_swap); +u64 format_field__intval (struct tep_format_field *field,struct perf_sample *sample,bool needs_swap); -struct format_field *perf_evsel__field (struct perf_evsel *evsel,const char *name); +struct tep_format_field *perf_evsel__field (struct perf_evsel *evsel,const char *name);#define perf_evsel__match (evsel, t, c) \ (evsel->attr.type == PERF_TYPE_##t && \
tools/perf/util/evsel_fprintf.c +1 -1
@@ -73,7 +73,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel, }if (details->trace_fields) { -struct format_field *field; +struct tep_format_field *field;if (evsel->attr.type !=PERF_TYPE_TRACEPOINT ) { printed +=comma_fprintf (fp, &first," (not a tracepoint)" );
tools/perf/util/python.c +2 -2
@@ -340,7 +340,7 @@ static bool is_tracepoint(struct pyrf_event *pevent) }static PyObject * -tracepoint_field (struct pyrf_event *pe,struct format_field *field) +tracepoint_field (struct pyrf_event *pe,struct tep_format_field *field) {struct tep_handle *pevent = field->event->pevent;void *data = pe->sample.raw_data;
@@ -383,7 +383,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name) {const char *str =_PyUnicode_AsString (PyObject_Str (attr_name));struct perf_evsel *evsel = pevent->evsel; -struct format_field *field; +struct tep_format_field *field;if (!evsel->tp_format) {struct tep_event_format *tp_format;
tools/perf/util/scripting-engines/trace-event-perl.c +2 -2
@@ -339,7 +339,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, {struct thread *thread = al->thread;struct tep_event_format *event = evsel->tp_format; -struct format_field *field; +struct tep_format_field *field;static char handler[256 ];unsigned long long val;unsigned long s, ns;
@@ -538,7 +538,7 @@ static int perl_stop_script(void)static int perl_generate_script (struct tep_handle *pevent,const char *outfile) {struct tep_event_format *event =NULL ; -struct format_field *f; +struct tep_format_field *f;char fname[PATH_MAX ];int not_first, count;FILE *ofp;
tools/perf/util/scripting-engines/trace-event-python.c +3 -3
@@ -333,7 +333,7 @@ static void define_event_symbols(struct tep_event_format *event, }static PyObject *get_field_numeric_entry (struct tep_event_format *event, -struct format_field *field,void *data) +struct tep_format_field *field,void *data) {bool is_array = field->flags &FIELD_IS_ARRAY ;PyObject *obj =NULL , *list =NULL ;
@@ -794,7 +794,7 @@ static void python_process_tracepoint(struct perf_sample *sample,PyObject *handler, *context, *t, *obj =NULL , *callchain;PyObject *dict =NULL , *all_entries_dict =NULL ;static char handler_name[256 ]; -struct format_field *field; +struct tep_format_field *field;unsigned long s, ns;unsigned n =0 ;int pid;
@@ -1591,7 +1591,7 @@ static int python_stop_script(void)static int python_generate_script (struct tep_handle *pevent,const char *outfile) {struct tep_event_format *event =NULL ; -struct format_field *f; +struct tep_format_field *f;char fname[PATH_MAX ];int not_first, count;FILE *ofp;
tools/perf/util/sort.c +9 -9
@@ -1884,7 +1884,7 @@ static int __sort_dimension__add_hpp_output(struct sort_dimension *sd,struct hpp_dynamic_entry {struct perf_hpp_fmt hpp;struct perf_evsel *evsel; -struct format_field *field; +struct tep_format_field *field;unsigned dynamic_len;bool raw_trace; };
@@ -1915,7 +1915,7 @@ static void update_dynamic_len(struct hpp_dynamic_entry *hde, struct hist_entry *he) {char *str, *pos; -struct format_field *field = hde->field; +struct tep_format_field *field = hde->field;size_t namelen;bool last = false;
@@ -2000,7 +2000,7 @@ static int __sort__hde_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,struct hpp_dynamic_entry *hde;size_t len = fmt->user_len;char *str, *pos; -struct format_field *field; +struct tep_format_field *field;size_t namelen;bool last = false;int ret;
@@ -2060,7 +2060,7 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, struct hist_entry *a, struct hist_entry *b) { struct hpp_dynamic_entry *hde; -struct format_field *field; +struct tep_format_field *field;unsigned offset, size; hde = container_of(fmt, struct hpp_dynamic_entry, hpp);
@@ -2117,7 +2117,7 @@ static void hde_free(struct perf_hpp_fmt *fmt) }static struct hpp_dynamic_entry * -__alloc_dynamic_entry (struct perf_evsel *evsel,struct format_field *field, +__alloc_dynamic_entry (struct perf_evsel *evsel,struct tep_format_field *field,int level) {struct hpp_dynamic_entry *hde;
@@ -2252,7 +2252,7 @@ static struct perf_evsel *find_evsel(struct perf_evlist *evlist, char *event_nam }static int __dynamic_dimension__add (struct perf_evsel *evsel, -struct format_field *field, +struct tep_format_field *field,bool raw_trace,int level) {struct hpp_dynamic_entry *hde;
@@ -2270,7 +2270,7 @@ static int __dynamic_dimension__add(struct perf_evsel *evsel,static int add_evsel_fields (struct perf_evsel *evsel,bool raw_trace,int level) {int ret; -struct format_field *field; +struct tep_format_field *field; field = evsel->tp_format->format.fields;while (field) {
@@ -2305,7 +2305,7 @@ static int add_all_matching_fields(struct perf_evlist *evlist, {int ret = -ESRCH ;struct perf_evsel *evsel; -struct format_field *field; +struct tep_format_field *field;evlist__for_each_entry (evlist, evsel) {if (evsel->attr.type !=PERF_TYPE_TRACEPOINT )
@@ -2327,7 +2327,7 @@ static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok, {char *str, *event_name, *field_name, *opt_name;struct perf_evsel *evsel; -struct format_field *field; +struct tep_format_field *field;bool raw_trace = symbol_conf.raw_trace;int ret =0 ;
tools/perf/util/trace-event-parse.c +2 -2
@@ -34,7 +34,7 @@ static int get_common_field(struct scripting_context *context, {struct tep_handle *pevent = context->pevent;struct tep_event_format *event; -struct format_field *field; +struct tep_format_field *field;if (!*size) {if (!pevent->events)
@@ -96,7 +96,7 @@ int common_pc(struct scripting_context *context)unsigned long long raw_field_value (struct tep_event_format *event,const char *name,void *data) { -struct format_field *field; +struct tep_format_field *field;unsigned long long val; field =tep_find_any_field (event, name);
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 8/27 tools lib traceevent, perf tools: Rename enum format_flags to enum tep_format_flags
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames enum format_flags to enum tep_format_flags and adds prefix TEP_ to all of its members.
--- tools/lib/traceevent/event-parse.c | 48 +++++++++++----------- tools/lib/traceevent/event-parse.h | 18 ++++---- tools/lib/traceevent/parse-filter.c | 8 ++-- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/evsel-tp-sched.c | 2 +- tools/perf/util/data-convert-bt.c | 34 +++++++-------- tools/perf/util/evsel.c | 2 +- tools/perf/util/python.c | 12 +++--- .../perf/util/scripting-engines/trace-event-perl.c | 18 ++++---- .../util/scripting-engines/trace-event-python.c | 26 ++++++------ tools/perf/util/sort.c | 4 +- 11 files changed, 87 insertions(+), 87 deletions(-)
tools/lib/traceevent/event-parse.c +24 -24
@@ -1301,7 +1301,7 @@ static int event_read_id(void)static int field_is_string (struct tep_format_field *field) { -if ((field->flags &FIELD_IS_ARRAY ) && +if ((field->flags &TEP_FIELD_IS_ARRAY ) && (strstr (field->type,"char" ) ||strstr (field->type,"u8" ) ||strstr (field->type,"s8" )))return 1 ;
@@ -1328,7 +1328,7 @@ static int field_is_long(struct tep_format_field *field)static unsigned int type_size (const char *name) { -/* This covers all FIELD_IS_STRING types. */ +/* This covers all TEP_FIELD_IS_STRING types. */ static struct { const char *type; unsigned int size;
@@ -1416,7 +1416,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f type == EVENT_OP && strcmp(token, ".") == 0)) {if (strcmp (token,"*" ) ==0 ) - field->flags |=FIELD_IS_POINTER ; + field->flags |=TEP_FIELD_IS_POINTER ;if (field->type) {char *new_type;
@@ -1455,7 +1455,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_fchar *new_brackets;int len; - field->flags |=FIELD_IS_ARRAY ; + field->flags |=TEP_FIELD_IS_ARRAY ; type =read_token (&token);
@@ -1544,11 +1544,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f }if (field_is_string (field)) - field->flags |=FIELD_IS_STRING ; + field->flags |=TEP_FIELD_IS_STRING ;if (field_is_dynamic (field)) - field->flags |=FIELD_IS_DYNAMIC ; + field->flags |=TEP_FIELD_IS_DYNAMIC ;if (field_is_long (field)) - field->flags |=FIELD_IS_LONG ; + field->flags |=TEP_FIELD_IS_LONG ;if (test_type_token (type, token,EVENT_OP ,";" )) goto fail;
@@ -1597,7 +1597,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f goto fail;if (strtoul (token,NULL ,0 )) - field->flags |=FIELD_IS_SIGNED ; + field->flags |=TEP_FIELD_IS_SIGNED ;free_token (token);if (read_expected (EVENT_OP ,";" ) <0 )
@@ -1609,14 +1609,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_ffree_token (token); -if (field->flags &FIELD_IS_ARRAY ) { +if (field->flags &TEP_FIELD_IS_ARRAY ) {if (field->arraylen) field->elementsize = field->size / field->arraylen; -else if (field->flags &FIELD_IS_DYNAMIC ) +else if (field->flags &TEP_FIELD_IS_DYNAMIC ) field->elementsize = size_dynamic; -else if (field->flags &FIELD_IS_STRING ) +else if (field->flags &TEP_FIELD_IS_STRING ) field->elementsize =1 ; -else if (field->flags &FIELD_IS_LONG ) +else if (field->flags &TEP_FIELD_IS_LONG ) field->elementsize = event->pevent ? event->pevent->long_size :sizeof (long );
@@ -2089,11 +2089,11 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *aif (is_flag_field) { arg->field.field =tep_find_any_field (event, arg->field.name); - arg->field.field->flags |=FIELD_IS_FLAG ; + arg->field.field->flags |=TEP_FIELD_IS_FLAG ; is_flag_field =0 ; }else if (is_symbolic_field) { arg->field.field =tep_find_any_field (event, arg->field.name); - arg->field.field->flags |=FIELD_IS_SYMBOLIC ; + arg->field.field->flags |=TEP_FIELD_IS_SYMBOLIC ; is_symbolic_field =0 ; }
@@ -3901,7 +3901,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* and the size is the same as long_size, assume that it * is a pointer. */ -if (!(field->flags &FIELD_IS_ARRAY ) && +if (!(field->flags &TEP_FIELD_IS_ARRAY ) && field->size == pevent->long_size) {/* Handle heterogeneous recording and processing
@@ -4794,16 +4794,16 @@ void tep_print_field(struct trace_seq *s, void *data,unsigned int offset, len, i;struct tep_handle *pevent = field->event->pevent; -if (field->flags &FIELD_IS_ARRAY ) { +if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { val =tep_read_number (pevent, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ; } -if (field->flags &FIELD_IS_STRING && +if (field->flags &TEP_FIELD_IS_STRING &&is_printable_array (data + offset, len)) {trace_seq_printf (s,"%s" , (char *)data + offset); }else {
@@ -4815,21 +4815,21 @@ void tep_print_field(struct trace_seq *s, void *data, *((unsigned char *)data + offset + i)); }trace_seq_putc (s,']' ); - field->flags &= ~FIELD_IS_STRING ; + field->flags &= ~TEP_FIELD_IS_STRING ; } }else { val =tep_read_number (pevent, data + field->offset, field->size); -if (field->flags &FIELD_IS_POINTER ) { +if (field->flags &TEP_FIELD_IS_POINTER ) {trace_seq_printf (s,"0x%llx" , val); - }else if (field->flags &FIELD_IS_SIGNED ) { + }else if (field->flags &TEP_FIELD_IS_SIGNED ) {switch (field->size) {case 4 :/* * If field is long then print it in hex. * A long usually stores pointers. */ -if (field->flags &FIELD_IS_LONG ) +if (field->flags &TEP_FIELD_IS_LONG )trace_seq_printf (s,"0x%x" , (int )val);else trace_seq_printf (s,"%d" , (int )val);
@@ -4844,7 +4844,7 @@ void tep_print_field(struct trace_seq *s, void *data,trace_seq_printf (s,"%lld" , val); } }else { -if (field->flags &FIELD_IS_LONG ) +if (field->flags &TEP_FIELD_IS_LONG )trace_seq_printf (s,"0x%llx" , val);else trace_seq_printf (s,"%llu" , val);
@@ -6288,7 +6288,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event, len = &dummy; offset = field->offset; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { offset =tep_read_number (event->pevent, data + offset, field->size); *len = offset >>16 ;
tools/lib/traceevent/event-parse.h +9 -9
@@ -130,15 +130,15 @@ struct tep_plugin_option {#define TEP_PLUGIN_OPTIONS_NAME MAKE_STR(TEP_PLUGIN_OPTIONS)#define TEP_PLUGIN_ALIAS_NAME MAKE_STR(TEP_PLUGIN_ALIAS) -enum format_flags { -FIELD_IS_ARRAY =1 , -FIELD_IS_POINTER =2 , -FIELD_IS_SIGNED =4 , -FIELD_IS_STRING =8 , -FIELD_IS_DYNAMIC =16 , -FIELD_IS_LONG =32 , -FIELD_IS_FLAG =64 , -FIELD_IS_SYMBOLIC =128 , +enum tep_format_flags { +TEP_FIELD_IS_ARRAY =1 , +TEP_FIELD_IS_POINTER =2 , +TEP_FIELD_IS_SIGNED =4 , +TEP_FIELD_IS_STRING =8 , +TEP_FIELD_IS_DYNAMIC =16 , +TEP_FIELD_IS_LONG =32 , +TEP_FIELD_IS_FLAG =64 , +TEP_FIELD_IS_SYMBOLIC =128 , };struct tep_format_field {
tools/lib/traceevent/parse-filter.c +4 -4
@@ -1716,7 +1716,7 @@ get_value(struct tep_event_format *event,tep_read_number_field (field, record->data, &val); -if (!(field->flags &FIELD_IS_SIGNED )) +if (!(field->flags &TEP_FIELD_IS_SIGNED ))return val;switch (field->size) {
@@ -1867,11 +1867,11 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *recochar hex[64 ];/* If the field is not a string convert it */ -if (arg->str.field->flags &FIELD_IS_STRING ) { +if (arg->str.field->flags &TEP_FIELD_IS_STRING ) { val = record->data + arg->str.field->offset; size = arg->str.field->size; -if (arg->str.field->flags &FIELD_IS_DYNAMIC ) { +if (arg->str.field->flags &TEP_FIELD_IS_DYNAMIC ) { addr = *(unsigned int *)val; val = record->data + (addr &0xffff ); size = addr >>16 ;
@@ -1893,7 +1893,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco pevent = event->pevent; addr =get_value (event, arg->str.field, record); -if (arg->str.field->flags & (FIELD_IS_POINTER |FIELD_IS_LONG )) +if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))/* convert to a kernel symbol */ val =tep_find_function (pevent, addr);
tools/perf/builtin-trace.c +1 -1
@@ -1293,7 +1293,7 @@ static int syscall__set_arg_fmts(struct syscall *sc)strcmp (field->name,"path" ) ==0 || strcmp(field->name, "pathname") == 0)) sc->arg_fmt[idx].scnprintf = SCA_FILENAME; - else if (field->flags & FIELD_IS_POINTER) + else if (field->flags & TEP_FIELD_IS_POINTER) sc->arg_fmt[idx].scnprintf = syscall_arg__scnprintf_hex; else if (strcmp(field->type, "pid_t") == 0) sc->arg_fmt[idx].scnprintf = SCA_PID;
tools/perf/tests/evsel-tp-sched.c +1 -1
@@ -17,7 +17,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,return -1 ; } - is_signed = !!(field->flags |FIELD_IS_SIGNED ); + is_signed = !!(field->flags |TEP_FIELD_IS_SIGNED );if (should_be_signed && !is_signed) {pr_debug ("%s: \"%s\" signedness(%d) is wrong, should be %d\n" , evsel->name, name, is_signed, should_be_signed);
tools/perf/util/data-convert-bt.c +17 -17
@@ -186,16 +186,16 @@ get_tracepoint_field_type(struct ctf_writer *cw, struct tep_format_field *field) {unsigned long flags = field->flags; -if (flags &FIELD_IS_STRING ) +if (flags &TEP_FIELD_IS_STRING )return cw->data.string; -if (!(flags &FIELD_IS_SIGNED )) { +if (!(flags &TEP_FIELD_IS_SIGNED )) {/* unsigned long are mostly pointers */ -if (flags &FIELD_IS_LONG || flags &FIELD_IS_POINTER ) +if (flags &TEP_FIELD_IS_LONG || flags &TEP_FIELD_IS_POINTER )return cw->data.u64_hex; } -if (flags &FIELD_IS_SIGNED ) { +if (flags &TEP_FIELD_IS_SIGNED ) {if (field->size ==8 )return cw->data.s64;else
@@ -304,10 +304,10 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, name = fmtf->alias; offset = fmtf->offset; len = fmtf->size; -if (flags &FIELD_IS_STRING ) - flags &= ~FIELD_IS_ARRAY ; +if (flags &TEP_FIELD_IS_STRING ) + flags &= ~TEP_FIELD_IS_ARRAY ; -if (flags &FIELD_IS_DYNAMIC ) { +if (flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long tmp_val; tmp_val = tep_read_number(fmtf->event->pevent,
@@ -317,7 +317,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, offset &=0xffff ; } -if (flags &FIELD_IS_ARRAY ) { +if (flags &TEP_FIELD_IS_ARRAY ) { type =bt_ctf_event_class_get_field_by_name ( event_class, name);
@@ -338,7 +338,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, type =get_tracepoint_field_type (cw, fmtf);for (i =0 ; i < n_items; i++) { -if (flags &FIELD_IS_ARRAY ) +if (flags &TEP_FIELD_IS_ARRAY ) field =bt_ctf_field_array_get_field (array_field, i);else field =bt_ctf_field_create (type);
@@ -348,7 +348,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,return -1 ; } -if (flags &FIELD_IS_STRING ) +if (flags &TEP_FIELD_IS_STRING ) ret =string_set_value (field, data + offset + i * len);else {unsigned long long value_int;
@@ -357,7 +357,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, fmtf->event->pevent, data + offset + i * len, len); -if (!(flags &FIELD_IS_SIGNED )) +if (!(flags &TEP_FIELD_IS_SIGNED )) ret =bt_ctf_field_unsigned_integer_set_value ( field, value_int);else
@@ -369,7 +369,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,pr_err ("failed to set file value %s\n" , name); goto err_put_field; } -if (!(flags &FIELD_IS_ARRAY )) { +if (!(flags &TEP_FIELD_IS_ARRAY )) { ret =bt_ctf_event_set_payload (event, name, field);if (ret) {pr_err ("failed to set payload %s\n" , name);
@@ -378,7 +378,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, }bt_ctf_field_put (field); } -if (flags &FIELD_IS_ARRAY ) { +if (flags &TEP_FIELD_IS_ARRAY ) { ret =bt_ctf_event_set_payload (event, name, array_field);if (ret) {pr_err ("Failed add payload array %s\n" , name);
@@ -1030,15 +1030,15 @@ static int add_tracepoint_fields_types(struct ctf_writer *cw,* type and don't care that it is an array. What we don't * support is an array of strings. */ -if (flags &FIELD_IS_STRING ) - flags &= ~FIELD_IS_ARRAY ; +if (flags &TEP_FIELD_IS_STRING ) + flags &= ~TEP_FIELD_IS_ARRAY ; -if (flags &FIELD_IS_ARRAY ) +if (flags &TEP_FIELD_IS_ARRAY ) type =bt_ctf_field_type_array_create (type, field->arraylen); ret =event_class_add_field (event_class, type, field); -if (flags &FIELD_IS_ARRAY ) +if (flags &TEP_FIELD_IS_ARRAY )bt_ctf_field_type_put (type);if (ret) {
tools/perf/util/evsel.c +1 -1
@@ -2698,7 +2698,7 @@ void *perf_evsel__rawptr(struct perf_evsel *evsel, struct perf_sample *sample, offset = field->offset; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { offset = *(int *)(sample->raw_data + field->offset); offset &=0xffff ; }
tools/perf/util/python.c +6 -6
@@ -348,28 +348,28 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field)unsigned long long val;unsigned int offset, len; -if (field->flags &FIELD_IS_ARRAY ) { +if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { val =tep_read_number (pevent, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ; } -if (field->flags &FIELD_IS_STRING && +if (field->flags &TEP_FIELD_IS_STRING &&is_printable_array (data + offset, len)) { ret =_PyUnicode_FromString ((char *)data + offset); }else { ret =PyByteArray_FromStringAndSize ((const char *) data + offset, len); - field->flags &= ~FIELD_IS_STRING ; + field->flags &= ~TEP_FIELD_IS_STRING ; } }else { val =tep_read_number (pevent, data + field->offset, field->size); -if (field->flags &FIELD_IS_POINTER ) +if (field->flags &TEP_FIELD_IS_POINTER ) ret =PyLong_FromUnsignedLong ((unsigned long ) val); -else if (field->flags &FIELD_IS_SIGNED ) +else if (field->flags &TEP_FIELD_IS_SIGNED ) ret =PyLong_FromLong ((long ) val);else ret =PyLong_FromUnsignedLong ((unsigned long ) val);
tools/perf/util/scripting-engines/trace-event-perl.c +9 -9
@@ -388,9 +388,9 @@ static void perl_process_tracepoint(struct perf_sample *sample,/* common fields other than pid can be accessed via xsub fns */ for (field = event->format.fields; field; field = field->next) { -if (field->flags &FIELD_IS_STRING ) { +if (field->flags &TEP_FIELD_IS_STRING ) {int offset; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { offset = *(int *)(data + field->offset); offset &=0xffff ; }else
@@ -399,7 +399,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, }else {/* FIELD_IS_NUMERIC */ val =read_size (event, data + field->offset, field->size); -if (field->flags &FIELD_IS_SIGNED ) { +if (field->flags &TEP_FIELD_IS_SIGNED ) {XPUSHs (sv_2mortal (newSViv (val))); }else {XPUSHs (sv_2mortal (newSVuv (val)));
@@ -646,11 +646,11 @@ sub print_backtrace\n\ count++;fprintf (ofp,"%s=" , f->name); -if (f->flags &FIELD_IS_STRING || - f->flags &FIELD_IS_FLAG || - f->flags &FIELD_IS_SYMBOLIC ) +if (f->flags &TEP_FIELD_IS_STRING || + f->flags &TEP_FIELD_IS_FLAG || + f->flags &TEP_FIELD_IS_SYMBOLIC )fprintf (ofp,"%%s" ); -else if (f->flags &FIELD_IS_SIGNED ) +else if (f->flags &TEP_FIELD_IS_SIGNED )fprintf (ofp,"%%d" );else fprintf (ofp,"%%u" );
@@ -668,7 +668,7 @@ sub print_backtrace\n\if (++count %5 ==0 )fprintf (ofp,"\n\t " ); -if (f->flags &FIELD_IS_FLAG ) { +if (f->flags &TEP_FIELD_IS_FLAG ) {if ((count -1 ) %5 !=0 ) {fprintf (ofp,"\n\t " ); count =4 ;
@@ -678,7 +678,7 @@ sub print_backtrace\n\ event->name);fprintf (ofp,"\"%s\", $%s)" , f->name, f->name); - }else if (f->flags &FIELD_IS_SYMBOLIC ) { + }else if (f->flags &TEP_FIELD_IS_SYMBOLIC ) {if ((count -1 ) %5 !=0 ) {fprintf (ofp,"\n\t " ); count =4 ;
tools/perf/util/scripting-engines/trace-event-python.c +13 -13
@@ -335,7 +335,7 @@ static void define_event_symbols(struct tep_event_format *event,static PyObject *get_field_numeric_entry (struct tep_event_format *event,struct tep_format_field *field,void *data) { -bool is_array = field->flags &FIELD_IS_ARRAY ; +bool is_array = field->flags &TEP_FIELD_IS_ARRAY ;PyObject *obj =NULL , *list =NULL ;unsigned long long val;unsigned int item_size, n_items, i;
@@ -353,7 +353,7 @@ static PyObject *get_field_numeric_entry(struct tep_event_format *event, val =read_size (event, data + field->offset + i * item_size, item_size); -if (field->flags &FIELD_IS_SIGNED ) { +if (field->flags &TEP_FIELD_IS_SIGNED ) {if ((long long )val >=LONG_MIN && (long long )val <=LONG_MAX ) obj =_PyLong_FromLong (val);
@@ -867,22 +867,22 @@ static void python_process_tracepoint(struct perf_sample *sample,unsigned int offset, len;unsigned long long val; -if (field->flags &FIELD_IS_ARRAY ) { +if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) { val =tep_read_number (scripting_context->pevent, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ; } -if (field->flags &FIELD_IS_STRING && +if (field->flags &TEP_FIELD_IS_STRING &&is_printable_array (data + offset, len)) { obj =_PyUnicode_FromString ((char *) data + offset); }else { obj =PyByteArray_FromStringAndSize ((const char *) data + offset, len); - field->flags &= ~FIELD_IS_STRING ; + field->flags &= ~TEP_FIELD_IS_STRING ; } }else {/* FIELD_IS_NUMERIC */ obj =get_field_numeric_entry (event, field, data);
@@ -1686,12 +1686,12 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile count++;fprintf (ofp,"%s=" , f->name); -if (f->flags &FIELD_IS_STRING || - f->flags &FIELD_IS_FLAG || - f->flags &FIELD_IS_ARRAY || - f->flags &FIELD_IS_SYMBOLIC ) +if (f->flags &TEP_FIELD_IS_STRING || + f->flags &TEP_FIELD_IS_FLAG || + f->flags &TEP_FIELD_IS_ARRAY || + f->flags &TEP_FIELD_IS_SYMBOLIC )fprintf (ofp,"%%s" ); -else if (f->flags &FIELD_IS_SIGNED ) +else if (f->flags &TEP_FIELD_IS_SIGNED )fprintf (ofp,"%%d" );else fprintf (ofp,"%%u" );
@@ -1709,7 +1709,7 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfileif (++count %5 ==0 )fprintf (ofp,"\n\t\t" ); -if (f->flags &FIELD_IS_FLAG ) { +if (f->flags &TEP_FIELD_IS_FLAG ) {if ((count -1 ) %5 !=0 ) {fprintf (ofp,"\n\t\t" ); count =4 ;
@@ -1719,7 +1719,7 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile event->name);fprintf (ofp,"\"%s\", %s)" , f->name, f->name); - }else if (f->flags &FIELD_IS_SYMBOLIC ) { + }else if (f->flags &TEP_FIELD_IS_SYMBOLIC ) {if ((count -1 ) %5 !=0 ) {fprintf (ofp,"\n\t\t" ); count =4 ;
tools/perf/util/sort.c +2 -2
@@ -1899,7 +1899,7 @@ static int hde_width(struct hpp_dynamic_entry *hde)if (namelen > len) len = namelen; -if (!(hde->field->flags &FIELD_IS_STRING )) { +if (!(hde->field->flags &TEP_FIELD_IS_STRING )) {/* length for print hex numbers */ fieldlen = hde->field->size *2 +2 ; }
@@ -2071,7 +2071,7 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, } field = hde->field; -if (field->flags &FIELD_IS_DYNAMIC ) { +if (field->flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long dyn;tep_read_number_field (field, a->raw_data, &dyn);
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 9/27 tools lib traceevent: Rename enum event_{sort_}type to enum tep_event_{sort_}type
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames enum event_type to enum tep_event_type, enum event_sort_type to enum tep_event_sort_type and add prefix TEP_ to all enum's members
--- tools/lib/traceevent/event-parse.c | 488 ++++++++++++++++++------------------ tools/lib/traceevent/event-parse.h | 34 +-- tools/lib/traceevent/parse-filter.c | 36 +-- 3 files changed, 279 insertions(+), 279 deletions(-)
tools/lib/traceevent/event-parse.c +244 -244
@@ -770,12 +770,12 @@ static int add_event(struct tep_handle *pevent, struct tep_event_format *event)return 0 ; } -static int event_item_type (enum event_type type) +static int event_item_type (enum tep_event_type type) {switch (type) { - case EVENT_ITEM ... EVENT_SQUOTE: + case TEP_EVENT_ITEM ... TEP_EVENT_SQUOTE:return 1 ; - case EVENT_ERROR ... EVENT_DELIM: + case TEP_EVENT_ERROR ... TEP_EVENT_DELIM:default :return 0 ; }
@@ -863,24 +863,24 @@ static void free_arg(struct print_arg *arg)free (arg); } -static enum event_type get_type (int ch) +static enum tep_event_type get_type (int ch) {if (ch =='\n' ) -return EVENT_NEWLINE ; +return TEP_EVENT_NEWLINE ;if (isspace (ch)) -return EVENT_SPACE ; +return TEP_EVENT_SPACE ;if (isalnum (ch) || ch =='_' ) -return EVENT_ITEM ; +return TEP_EVENT_ITEM ;if (ch =='\'' ) -return EVENT_SQUOTE ; +return TEP_EVENT_SQUOTE ;if (ch =='"' ) -return EVENT_DQUOTE ; +return TEP_EVENT_DQUOTE ;if (!isprint (ch)) -return EVENT_NONE ; +return TEP_EVENT_NONE ;if (ch =='(' || ch ==')' || ch ==',' ) -return EVENT_DELIM ; +return TEP_EVENT_DELIM ; -return EVENT_OP ; +return TEP_EVENT_OP ; }static int __read_char (void )
@@ -928,38 +928,38 @@ static int extend_token(char **tok, char *buf, int size)return 0 ; } -static enum event_type force_token (const char *str,char **tok); +static enum tep_event_type force_token (const char *str,char **tok); -static enum event_type __read_token (char **tok) +static enum tep_event_type __read_token (char **tok) {char buf[BUFSIZ ];int ch, last_ch, quote_ch, next_ch;int i =0 ;int tok_size =0 ; -enum event_type type; +enum tep_event_type type; *tok =NULL ; ch =__read_char ();if (ch <0 ) -return EVENT_NONE ; +return TEP_EVENT_NONE ; type =get_type (ch); -if (type ==EVENT_NONE ) +if (type ==TEP_EVENT_NONE )return type; buf[i++] = ch;switch (type) { -case EVENT_NEWLINE : -case EVENT_DELIM : +case TEP_EVENT_NEWLINE : +case TEP_EVENT_DELIM :if (asprintf (tok,"%c" , ch) <0 ) -return EVENT_ERROR ; +return TEP_EVENT_ERROR ;return type; -case EVENT_OP : +case TEP_EVENT_OP :switch (ch) {case '-' : next_ch =__peek_char ();
@@ -1002,8 +1002,8 @@ static enum event_type __read_token(char **tok) buf[i++] =__read_char (); goto out; -case EVENT_DQUOTE : -case EVENT_SQUOTE : +case TEP_EVENT_DQUOTE : +case TEP_EVENT_SQUOTE :/* don't keep quotes */ i--; quote_ch = ch;
@@ -1015,7 +1015,7 @@ static enum event_type __read_token(char **tok) tok_size +=BUFSIZ ;if (extend_token (tok, buf, tok_size) <0 ) -return EVENT_NONE ; +return TEP_EVENT_NONE ; i =0 ; } last_ch = ch;
@@ -1032,7 +1032,7 @@ static enum event_type __read_token(char **tok)* For strings (double quotes) check the next token. * If it is another string, concatinate the two. */ -if (type ==EVENT_DQUOTE ) { +if (type ==TEP_EVENT_DQUOTE ) {unsigned long long save_input_buf_ptr = input_buf_ptr; do {
@@ -1045,8 +1045,8 @@ static enum event_type __read_token(char **tok) goto out; - case EVENT_ERROR ... EVENT_SPACE: -case EVENT_ITEM : + case TEP_EVENT_ERROR ... TEP_EVENT_SPACE: +case TEP_EVENT_ITEM :default :break ; }
@@ -1057,7 +1057,7 @@ static enum event_type __read_token(char **tok) tok_size +=BUFSIZ ;if (extend_token (tok, buf, tok_size) <0 ) -return EVENT_NONE ; +return TEP_EVENT_NONE ; i =0 ; } ch =__read_char ();
@@ -1067,9 +1067,9 @@ static enum event_type __read_token(char **tok) out: buf[i] =0 ;if (extend_token (tok, buf, tok_size + i +1 ) <0 ) -return EVENT_NONE ; +return TEP_EVENT_NONE ; -if (type ==EVENT_ITEM ) { +if (type ==TEP_EVENT_ITEM ) {/* * Older versions of the kernel has a bug that * creates invalid symbols and will break the mac80211
@@ -1096,12 +1096,12 @@ static enum event_type __read_token(char **tok)return type; } -static enum event_type force_token (const char *str,char **tok) +static enum tep_event_type force_token (const char *str,char **tok) {const char *save_input_buf;unsigned long long save_input_buf_ptr;unsigned long long save_input_buf_siz; -enum event_type type; +enum tep_event_type type;/* save off the current input pointers */ save_input_buf = input_buf;
@@ -1126,13 +1126,13 @@ static void free_token(char *tok)free (tok); } -static enum event_type read_token (char **tok) +static enum tep_event_type read_token (char **tok) { -enum event_type type; +enum tep_event_type type;for (;;) { type =__read_token (tok); -if (type !=EVENT_SPACE ) +if (type !=TEP_EVENT_SPACE )return type;free_token (*tok);
@@ -1140,7 +1140,7 @@ static enum event_type read_token(char **tok)/* not reached */ *tok =NULL ; -return EVENT_NONE ; +return TEP_EVENT_NONE ; }/**
@@ -1152,7 +1152,7 @@ static enum event_type read_token(char **tok)* * Returns the token type. */ -enum event_type tep_read_token (char **tok) +enum tep_event_type tep_read_token (char **tok) {return read_token (tok); }
@@ -1167,13 +1167,13 @@ void tep_free_token(char *token) }/* no newline */ -static enum event_type read_token_item (char **tok) +static enum tep_event_type read_token_item (char **tok) { -enum event_type type; +enum tep_event_type type;for (;;) { type =__read_token (tok); -if (type !=EVENT_SPACE && type !=EVENT_NEWLINE ) +if (type !=TEP_EVENT_SPACE && type !=TEP_EVENT_NEWLINE )return type;free_token (*tok); *tok =NULL ;
@@ -1181,10 +1181,10 @@ static enum event_type read_token_item(char **tok)/* not reached */ *tok =NULL ; -return EVENT_NONE ; +return TEP_EVENT_NONE ; } -static int test_type (enum event_type type,enum event_type expect) +static int test_type (enum tep_event_type type,enum tep_event_type expect) {if (type != expect) { do_warning("Error: expected type %d but read %d",
@@ -1194,8 +1194,8 @@ static int test_type(enum event_type type, enum event_type expect)return 0 ; } -static int test_type_token (enum event_type type,const char *token, -enum event_type expect,const char *expect_tok) +static int test_type_token (enum tep_event_type type,const char *token, +enum tep_event_type expect,const char *expect_tok) {if (type != expect) { do_warning("Error: expected type %d but read %d",
@@ -1211,9 +1211,9 @@ static int test_type_token(enum event_type type, const char *token,return 0 ; } -static int __read_expect_type (enum event_type expect,char **tok,int newline_ok) +static int __read_expect_type (enum tep_event_type expect,char **tok,int newline_ok) { -enum event_type type; +enum tep_event_type type;if (newline_ok) type =read_token (tok);
@@ -1222,15 +1222,15 @@ static int __read_expect_type(enum event_type expect, char **tok, int newline_okreturn test_type (type, expect); } -static int read_expect_type (enum event_type expect,char **tok) +static int read_expect_type (enum tep_event_type expect,char **tok) {return __read_expect_type (expect, tok,1 ); } -static int __read_expected (enum event_type expect,const char *str, +static int __read_expected (enum tep_event_type expect,const char *str,int newline_ok) { -enum event_type type; +enum tep_event_type type;char *token;int ret;
@@ -1246,12 +1246,12 @@ static int __read_expected(enum event_type expect, const char *str,return ret; } -static int read_expected (enum event_type expect,const char *str) +static int read_expected (enum tep_event_type expect,const char *str) {return __read_expected (expect, str,1 ); } -static int read_expected_item (enum event_type expect,const char *str) +static int read_expected_item (enum tep_event_type expect,const char *str) {return __read_expected (expect, str,0 ); }
@@ -1260,13 +1260,13 @@ static char *event_read_name(void) {char *token; -if (read_expected (EVENT_ITEM ,"name" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"name" ) <0 )return NULL ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return NULL ; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail;return token;
@@ -1281,13 +1281,13 @@ static int event_read_id(void)char *token;int id; -if (read_expected_item (EVENT_ITEM ,"ID" ) <0 ) +if (read_expected_item (TEP_EVENT_ITEM ,"ID" ) <0 )return -1 ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return -1 ; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail; id =strtoul (token,NULL ,0 );
@@ -1357,7 +1357,7 @@ static unsigned int type_size(const char *name)static int event_read_fields (struct tep_event_format *event,struct tep_format_field **fields) {struct tep_format_field *field =NULL ; -enum event_type type; +enum tep_event_type type;char *token;char *last_token;int count =0 ;
@@ -1366,14 +1366,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_funsigned int size_dynamic =0 ; type =read_token (&token); -if (type ==EVENT_NEWLINE ) { +if (type ==TEP_EVENT_NEWLINE ) {free_token (token);return count; } count++; -if (test_type_token (type, token,EVENT_ITEM ,"field" )) +if (test_type_token (type, token,TEP_EVENT_ITEM ,"field" )) goto fail;free_token (token);
@@ -1383,16 +1383,16 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f* Just ignore it. */ if (event->flags &EVENT_FL_ISFTRACE && - type ==EVENT_ITEM &&strcmp (token,"special" ) ==0 ) { + type ==TEP_EVENT_ITEM &&strcmp (token,"special" ) ==0 ) {free_token (token); type =read_token (&token); } -if (test_type_token (type, token,EVENT_OP ,":" ) <0 ) +if (test_type_token (type, token,TEP_EVENT_OP ,":" ) <0 ) goto fail;free_token (token); -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail; last_token = token;
@@ -1406,14 +1406,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f/* read the rest of the type */ for (;;) { type =read_token (&token); -if (type ==EVENT_ITEM || - (type ==EVENT_OP &&strcmp (token,"*" ) ==0 ) || +if (type ==TEP_EVENT_ITEM || + (type ==TEP_EVENT_OP &&strcmp (token,"*" ) ==0 ) ||/* * Some of the ftrace fields are broken and have * an illegal "." in them. */ (event->flags &EVENT_FL_ISFTRACE && - type ==EVENT_OP &&strcmp (token,"." ) ==0 )) { + type ==TEP_EVENT_OP &&strcmp (token,"." ) ==0 )) {if (strcmp (token,"*" ) ==0 ) field->flags |=TEP_FIELD_IS_POINTER ;
@@ -1446,11 +1446,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f } field->name = field->alias = last_token; -if (test_type (type,EVENT_OP )) +if (test_type (type,TEP_EVENT_OP )) goto fail;if (strcmp (token,"[" ) ==0 ) { -enum event_type last_type = type; +enum tep_event_type last_type = type;char *brackets = token;char *new_brackets;int len;
@@ -1459,14 +1459,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f type =read_token (&token); -if (type ==EVENT_ITEM ) +if (type ==TEP_EVENT_ITEM ) field->arraylen =strtoul (token,NULL ,0 );else field->arraylen =0 ;while (strcmp (token,"]" ) !=0 ) { -if (last_type ==EVENT_ITEM && - type ==EVENT_ITEM ) +if (last_type ==TEP_EVENT_ITEM && + type ==TEP_EVENT_ITEM ) len =2 ;else len =1 ;
@@ -1487,7 +1487,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f field->arraylen =strtoul (token,NULL ,0 );free_token (token); type =read_token (&token); -if (type ==EVENT_NONE ) { +if (type ==TEP_EVENT_NONE ) {do_warning_event (event,"failed to find token" ); goto fail; }
@@ -1510,7 +1510,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f* If the next token is not an OP, then it is of * the format: type [] item; */ -if (type ==EVENT_ITEM ) { +if (type ==TEP_EVENT_ITEM ) {char *new_type; new_type = realloc(field->type, strlen(field->type) +
@@ -1550,60 +1550,60 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_fif (field_is_long (field)) field->flags |=TEP_FIELD_IS_LONG ; -if (test_type_token (type, token,EVENT_OP ,";" )) +if (test_type_token (type, token,TEP_EVENT_OP ,";" )) goto fail;free_token (token); -if (read_expected (EVENT_ITEM ,"offset" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"offset" ) <0 ) goto fail_expect; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 ) goto fail_expect; -if (read_expect_type (EVENT_ITEM , &token)) +if (read_expect_type (TEP_EVENT_ITEM , &token)) goto fail; field->offset =strtoul (token,NULL ,0 );free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 ) goto fail_expect; -if (read_expected (EVENT_ITEM ,"size" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"size" ) <0 ) goto fail_expect; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 ) goto fail_expect; -if (read_expect_type (EVENT_ITEM , &token)) +if (read_expect_type (TEP_EVENT_ITEM , &token)) goto fail; field->size =strtoul (token,NULL ,0 );free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 ) goto fail_expect; type =read_token (&token); -if (type !=EVENT_NEWLINE ) { +if (type !=TEP_EVENT_NEWLINE ) {/* newer versions of the kernel have a "signed" type */ -if (test_type_token (type, token,EVENT_ITEM ,"signed" )) +if (test_type_token (type, token,TEP_EVENT_ITEM ,"signed" )) goto fail;free_token (token); -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 ) goto fail_expect; -if (read_expect_type (EVENT_ITEM , &token)) +if (read_expect_type (TEP_EVENT_ITEM , &token)) goto fail;if (strtoul (token,NULL ,0 )) field->flags |=TEP_FIELD_IS_SIGNED ;free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 ) goto fail_expect; -if (read_expect_type (EVENT_NEWLINE , &token)) +if (read_expect_type (TEP_EVENT_NEWLINE , &token)) goto fail; }
@@ -1646,13 +1646,13 @@ static int event_read_format(struct tep_event_format *event)char *token;int ret; -if (read_expected_item (EVENT_ITEM ,"format" ) <0 ) +if (read_expected_item (TEP_EVENT_ITEM ,"format" ) <0 )return -1 ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return -1 ; -if (read_expect_type (EVENT_NEWLINE , &token)) +if (read_expect_type (TEP_EVENT_NEWLINE , &token)) goto fail;free_token (token);
@@ -1673,14 +1673,14 @@ static int event_read_format(struct tep_event_format *event)return -1 ; } -static enum event_type +static enum tep_event_type process_arg_token (struct tep_event_format *event,struct print_arg *arg, -char **tok,enum event_type type); +char **tok,enum tep_event_type type); -static enum event_type +static enum tep_event_type process_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) { -enum event_type type; +enum tep_event_type type;char *token; type =read_token (&token);
@@ -1689,32 +1689,32 @@ process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok)return process_arg_token (event, arg, tok, type); } -static enum event_type +static enum tep_event_type process_op (struct tep_event_format *event,struct print_arg *arg,char **tok);/* * For __print_symbolic() and __print_flags, we need to completely * evaluate the first argument, which defines what to print next. */ -static enum event_type +static enum tep_event_type process_field_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) { -enum event_type type; +enum tep_event_type type; type =process_arg (event, arg, tok); -while (type ==EVENT_OP ) { +while (type ==TEP_EVENT_OP ) { type =process_op (event, arg, tok); }return type; } -static enum event_type +static enum tep_event_type process_cond (struct tep_event_format *event,struct print_arg *top,char **tok) {struct print_arg *arg, *left, *right; -enum event_type type; +enum tep_event_type type;char *token =NULL ; arg =alloc_arg ();
@@ -1737,16 +1737,16 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) type =process_arg (event, left, &token); again: -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) goto out_free;/* Handle other operations in the arguments */ -if (type ==EVENT_OP &&strcmp (token,":" ) !=0 ) { +if (type ==TEP_EVENT_OP &&strcmp (token,":" ) !=0 ) { type =process_op (event, left, &token); goto again; } -if (test_type_token (type, token,EVENT_OP ,":" )) +if (test_type_token (type, token,TEP_EVENT_OP ,":" )) goto out_free; arg->op.op = token;
@@ -1763,14 +1763,14 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) top->op.right =NULL ;free_token (token);free_arg (arg); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_array (struct tep_event_format *event,struct print_arg *top,char **tok) {struct print_arg *arg; -enum event_type type; +enum tep_event_type type;char *token =NULL ; arg =alloc_arg ();
@@ -1778,12 +1778,12 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok)do_warning_event (event,"%s: not enough memory!" , __func__);/* '*tok' is set to top->op.op. No need to free. */ *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } *tok =NULL ; type =process_arg (event, arg, &token); -if (test_type_token (type, token,EVENT_OP ,"]" )) +if (test_type_token (type, token,TEP_EVENT_OP ,"]" )) goto out_free; top->op.right = arg;
@@ -1797,7 +1797,7 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok) out_free:free_token (token);free_arg (arg); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; }static int get_op_prio (char *op)
@@ -1868,11 +1868,11 @@ static int set_op_prio(struct print_arg *arg) }/* Note, *tok does not get freed, but will most likely be saved */ -static enum event_type +static enum tep_event_type process_op (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *left, *right =NULL ; -enum event_type type; +enum tep_event_type type;char *token;/* the op is passed in via tok */
@@ -1974,7 +1974,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)/* could just be a type pointer */ if ((strcmp (arg->op.op,"*" ) ==0 ) && - type ==EVENT_DELIM && (strcmp (token,")" ) ==0 )) { + type ==TEP_EVENT_DELIM && (strcmp (token,")" ) ==0 )) {char *new_atom;if (left->type !=PRINT_ATOM ) {
@@ -2000,7 +2000,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) goto out_warn_free; type =process_arg_token (event, right, tok, type); -if (type ==EVENT_ERROR ) { +if (type ==TEP_EVENT_ERROR ) {free_arg (right);/* token was freed in process_arg_token() via *tok */ token =NULL ;
@@ -2047,7 +2047,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) goto out_free; } -if (type ==EVENT_OP &&strcmp (*tok,":" ) !=0 ) { +if (type ==TEP_EVENT_OP &&strcmp (*tok,":" ) !=0 ) {int prio;/* higher prios need to be closer to the root */
@@ -2066,21 +2066,21 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) out_free:free_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_entry (struct tep_event_format *event__maybe_unused ,struct print_arg *arg,char **tok) { -enum event_type type; +enum tep_event_type type;char *field;char *token; -if (read_expected (EVENT_OP ,"->" ) <0 ) +if (read_expected (TEP_EVENT_OP ,"->" ) <0 ) goto out_err; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; field = token;
@@ -2106,14 +2106,14 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *afree_token (token); out_err: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; }static int alloc_and_process_delim (struct tep_event_format *event,char *next_token,struct print_arg **print_arg) {struct print_arg *field; -enum event_type type; +enum tep_event_type type;char *token;int ret =0 ;
@@ -2126,7 +2126,7 @@ static int alloc_and_process_delim(struct tep_event_format *event, char *next_to type =process_arg (event, field, &token); -if (test_type_token (type, token,EVENT_DELIM , next_token)) { +if (test_type_token (type, token,TEP_EVENT_DELIM , next_token)) { errno =EINVAL ; ret =-1 ;free_arg (field);
@@ -2443,10 +2443,10 @@ static char *arg_eval (struct print_arg *arg)return NULL ; } -static enum event_type +static enum tep_event_type process_fields (struct tep_event_format *event,struct print_flag_sym **list,char **tok) { -enum event_type type; +enum tep_event_type type;struct print_arg *arg =NULL ;struct print_flag_sym *field;char *token = *tok;
@@ -2455,7 +2455,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha do { free_token(token); type = read_token_item(&token); - if (test_type_token(type, token, EVENT_OP, "{")) + if (test_type_token(type, token, TEP_EVENT_OP, "{")) break; arg = alloc_arg();
@@ -2465,13 +2465,13 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, chafree_token (token); type =process_arg (event, arg, &token); -if (type ==EVENT_OP ) +if (type ==TEP_EVENT_OP ) type =process_op (event, arg, &token); -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) goto out_free; -if (test_type_token (type, token,EVENT_DELIM ,"," )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,"," )) goto out_free; field =calloc (1 ,sizeof (*field));
@@ -2492,7 +2492,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, chafree_token (token); type =process_arg (event, arg, &token); -if (test_type_token (type, token,EVENT_OP ,"}" )) +if (test_type_token (type, token,TEP_EVENT_OP ,"}" )) goto out_free_field; value =arg_eval (arg);
@@ -2509,7 +2509,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, chafree_token (token); type =read_token_item (&token); - }while (type ==EVENT_DELIM &&strcmp (token,"," ) ==0 ); + }while (type ==TEP_EVENT_DELIM &&strcmp (token,"," ) ==0 ); *tok = token;return type;
@@ -2521,14 +2521,14 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, chafree_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_flags (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *field; -enum event_type type; +enum tep_event_type type;char *token =NULL ;memset (arg,0 ,sizeof (*arg));
@@ -2543,10 +2543,10 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) type =process_field_arg (event, field, &token);/* Handle operations in the first argument */ -while (type ==EVENT_OP ) +while (type ==TEP_EVENT_OP ) type =process_op (event, field, &token); -if (test_type_token (type, token,EVENT_DELIM ,"," )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,"," )) goto out_free_field;free_token (token);
@@ -2558,11 +2558,11 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) type =read_token_item (&token); } -if (test_type_token (type, token,EVENT_DELIM ,"," )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,"," )) goto out_free; type =process_fields (event, &arg->flags.flags, &token); -if (test_type_token (type, token,EVENT_DELIM ,")" )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,")" )) goto out_free;free_token (token);
@@ -2574,14 +2574,14 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) out_free:free_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_symbols (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *field; -enum event_type type; +enum tep_event_type type;char *token =NULL ;memset (arg,0 ,sizeof (*arg));
@@ -2595,13 +2595,13 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to type =process_field_arg (event, field, &token); -if (test_type_token (type, token,EVENT_DELIM ,"," )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,"," )) goto out_free_field; arg->symbol.field = field; type =process_fields (event, &arg->symbol.symbols, &token); -if (test_type_token (type, token,EVENT_DELIM ,")" )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,")" )) goto out_free;free_token (token);
@@ -2613,10 +2613,10 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to out_free:free_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_hex_common (struct tep_event_format *event,struct print_arg *arg,char **tok,enum print_arg_type type) {
@@ -2636,23 +2636,23 @@ process_hex_common(struct tep_event_format *event, struct print_arg *arg, arg->hex.field =NULL ; out: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_hex (struct tep_event_format *event,struct print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX ); } -static enum event_type +static enum tep_event_type process_hex_str (struct tep_event_format *event,struct print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX_STR ); } -static enum event_type +static enum tep_event_type process_int_array (struct tep_event_format *event,struct print_arg *arg,char **tok) {memset (arg,0 ,sizeof (*arg));
@@ -2677,14 +2677,14 @@ process_int_array(struct tep_event_format *event, struct print_arg *arg, char ** arg->int_array.field =NULL ; out: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_dynamic_array (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct tep_format_field *field; -enum event_type type; +enum tep_event_type type;char *token;memset (arg,0 ,sizeof (*arg));
@@ -2696,7 +2696,7 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha*/ type =read_token (&token); *tok = token; -if (type !=EVENT_ITEM ) +if (type !=TEP_EVENT_ITEM ) goto out_free;/* Find the field */
@@ -2708,13 +2708,13 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha arg->dynarray.field = field; arg->dynarray.index =0 ; -if (read_expected (EVENT_DELIM ,")" ) <0 ) +if (read_expected (TEP_EVENT_DELIM ,")" ) <0 ) goto out_free;free_token (token); type =read_token_item (&token); *tok = token; -if (type !=EVENT_OP ||strcmp (token,"[" ) !=0 ) +if (type !=TEP_EVENT_OP ||strcmp (token,"[" ) !=0 )return type;free_token (token);
@@ -2722,14 +2722,14 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, chaif (!arg) {do_warning_event (event,"%s: not enough memory!" , __func__); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } type =process_arg (event, arg, &token); -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) goto out_free_arg; -if (!test_type_token (type, token,EVENT_OP ,"]" )) +if (!test_type_token (type, token,TEP_EVENT_OP ,"]" )) goto out_free_arg;free_token (token);
@@ -2741,18 +2741,18 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha out_free:free_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_dynamic_array_len (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct tep_format_field *field; -enum event_type type; +enum tep_event_type type;char *token; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; arg->type =PRINT_DYNAMIC_ARRAY_LEN ;
@@ -2765,7 +2765,7 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, arg->dynarray.field = field; arg->dynarray.index =0 ; -if (read_expected (EVENT_DELIM ,")" ) <0 ) +if (read_expected (TEP_EVENT_DELIM ,")" ) <0 ) goto out_err; type =read_token (&token);
@@ -2777,28 +2777,28 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg,free_token (token); out_err: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_paren (struct tep_event_format *event,struct print_arg *arg,char **tok) {struct print_arg *item_arg; -enum event_type type; +enum tep_event_type type;char *token; type =process_arg (event, arg, &token); -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) goto out_free; -if (type ==EVENT_OP ) +if (type ==TEP_EVENT_OP ) type =process_op (event, arg, &token); -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) goto out_free; -if (test_type_token (type, token,EVENT_DELIM ,")" )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,")" )) goto out_free;free_token (token);
@@ -2809,7 +2809,7 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok)* this was a typecast. */ if (event_item_type (type) || - (type ==EVENT_DELIM &&strcmp (token,"(" ) ==0 )) { + (type ==TEP_EVENT_DELIM &&strcmp (token,"(" ) ==0 )) {/* make this a typecast and contine */
@@ -2839,25 +2839,25 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok) out_free:free_token (token); *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_str (struct tep_event_format *event__maybe_unused ,struct print_arg *arg,char **tok) { -enum event_type type; +enum tep_event_type type;char *token; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; arg->type =PRINT_STRING ; arg->string.string = token; arg->string.offset =-1 ; -if (read_expected (EVENT_DELIM ,")" ) <0 ) +if (read_expected (TEP_EVENT_DELIM ,")" ) <0 ) goto out_err; type =read_token (&token);
@@ -2869,24 +2869,24 @@ process_str(struct tep_event_format *event __maybe_unused, struct print_arg *argfree_token (token); out_err: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_bitmask (struct tep_event_format *event__maybe_unused ,struct print_arg *arg,char **tok) { -enum event_type type; +enum tep_event_type type;char *token; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; arg->type =PRINT_BITMASK ; arg->bitmask.bitmask = token; arg->bitmask.offset =-1 ; -if (read_expected (EVENT_DELIM ,")" ) <0 ) +if (read_expected (TEP_EVENT_DELIM ,")" ) <0 ) goto out_err; type =read_token (&token);
@@ -2898,7 +2898,7 @@ process_bitmask(struct tep_event_format *event __maybe_unused, struct print_argfree_token (token); out_err: *tok =NULL ; -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } static struct tep_function_handler *
@@ -2933,13 +2933,13 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name) } } -static enum event_type +static enum tep_event_type process_func_handler (struct tep_event_format *event,struct tep_function_handler *func,struct print_arg *arg,char **tok) {struct print_arg **next_arg;struct print_arg *farg; -enum event_type type; +enum tep_event_type type;char *token;int i;
@@ -2954,12 +2954,12 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handlerif (!farg) {do_warning_event (event,"%s: not enough memory!" , __func__); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } type =process_arg (event, farg, &token);if (i < (func->nr_args -1 )) { -if (type !=EVENT_DELIM ||strcmp (token,"," ) !=0 ) { +if (type !=TEP_EVENT_DELIM ||strcmp (token,"," ) !=0 ) { do_warning_event(event, "Error: function '%s()' expects %d arguments but event %s only uses %d", func->name, func->nr_args,
@@ -2967,7 +2967,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler goto err; } }else { -if (type !=EVENT_DELIM ||strcmp (token,")" ) !=0 ) { +if (type !=TEP_EVENT_DELIM ||strcmp (token,")" ) !=0 ) {do_warning_event (event,"Error: function '%s()' only expects %d arguments but event %s has more" , func->name, func->nr_args, event->name);
@@ -2988,10 +2988,10 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler err:free_arg (farg);free_token (token); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_function (struct tep_event_format *event,struct print_arg *arg,char *token,char **tok) {
@@ -3044,12 +3044,12 @@ process_function(struct tep_event_format *event, struct print_arg *arg,do_warning_event (event,"function %s not defined" , token);free_token (token); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } -static enum event_type +static enum tep_event_type process_arg_token (struct tep_event_format *event,struct print_arg *arg, -char **tok,enum event_type type) +char **tok,enum tep_event_type type) {char *token;char *atom;
@@ -3057,7 +3057,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, token = *tok;switch (type) { -case EVENT_ITEM : +case TEP_EVENT_ITEM :if (strcmp (token,"REC" ) ==0 ) {free_token (token); type =process_entry (event, arg, &token);
@@ -3071,7 +3071,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,* If the next token is a parenthesis, then this * is a function. */ -if (type ==EVENT_DELIM &&strcmp (token,"(" ) ==0 ) { +if (type ==TEP_EVENT_DELIM &&strcmp (token,"(" ) ==0 ) {free_token (token); token =NULL ;/* this will free atom. */
@@ -3079,7 +3079,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,break ; }/* atoms can be more than one token long */ -while (type ==EVENT_ITEM ) { +while (type ==TEP_EVENT_ITEM ) {char *new_atom; new_atom =realloc (atom,strlen (atom) +strlen (token) +2 );
@@ -3087,7 +3087,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,free (atom); *tok =NULL ;free_token (token); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } atom = new_atom;strcat (atom," " );
@@ -3100,19 +3100,19 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, arg->atom.atom = atom;break ; -case EVENT_DQUOTE : -case EVENT_SQUOTE : +case TEP_EVENT_DQUOTE : +case TEP_EVENT_SQUOTE : arg->type =PRINT_ATOM ; arg->atom.atom = token; type =read_token_item (&token);break ; -case EVENT_DELIM : +case TEP_EVENT_DELIM :if (strcmp (token,"(" ) ==0 ) {free_token (token); type =process_paren (event, arg, &token);break ; } -case EVENT_OP : +case TEP_EVENT_OP :/* handle single ops */ arg->type =PRINT_OP ; arg->op.op = token;
@@ -3120,16 +3120,16 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, type =process_op (event, arg, &token);/* On error, the op is freed */ -if (type ==EVENT_ERROR ) +if (type ==TEP_EVENT_ERROR ) arg->op.op =NULL ;/* return error type if errored */ break ; - case EVENT_ERROR ... EVENT_NEWLINE: + case TEP_EVENT_ERROR ... TEP_EVENT_NEWLINE:default :do_warning_event (event,"unexpected type %d" , type); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; } *tok = token;
@@ -3138,13 +3138,13 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,static int event_read_print_args (struct tep_event_format *event,struct print_arg **list) { -enum event_type type =EVENT_ERROR ; +enum tep_event_type type =TEP_EVENT_ERROR ;struct print_arg *arg;char *token;int args =0 ; do { - if (type == EVENT_NEWLINE) { + if (type == TEP_EVENT_NEWLINE) { type = read_token_item(&token); continue; }
@@ -3158,7 +3158,7 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar type =process_arg (event, arg, &token); -if (type ==EVENT_ERROR ) { +if (type ==TEP_EVENT_ERROR ) {free_token (token);free_arg (arg);return -1 ;
@@ -3167,10 +3167,10 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar *list = arg; args++; -if (type ==EVENT_OP ) { +if (type ==TEP_EVENT_OP ) { type =process_op (event, arg, &token);free_token (token); -if (type ==EVENT_ERROR ) { +if (type ==TEP_EVENT_ERROR ) { *list =NULL ;free_arg (arg);return -1 ;
@@ -3179,16 +3179,16 @@ static int event_read_print_args(struct tep_event_format *event, struct print_arcontinue ; } -if (type ==EVENT_DELIM &&strcmp (token,"," ) ==0 ) { +if (type ==TEP_EVENT_DELIM &&strcmp (token,"," ) ==0 ) {free_token (token); *list = arg; list = &arg->next;continue ; }break ; - }while (type !=EVENT_NONE ); + }while (type !=TEP_EVENT_NONE ); -if (type !=EVENT_NONE && type !=EVENT_ERROR ) +if (type !=TEP_EVENT_NONE && type !=TEP_EVENT_ERROR )free_token (token);return args;
@@ -3196,20 +3196,20 @@ static int event_read_print_args(struct tep_event_format *event, struct print_arstatic int event_read_print (struct tep_event_format *event) { -enum event_type type; +enum tep_event_type type;char *token;int ret; -if (read_expected_item (EVENT_ITEM ,"print" ) <0 ) +if (read_expected_item (TEP_EVENT_ITEM ,"print" ) <0 )return -1 ; -if (read_expected (EVENT_ITEM ,"fmt" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"fmt" ) <0 )return -1 ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return -1 ; -if (read_expect_type (EVENT_DQUOTE , &token) <0 ) +if (read_expect_type (TEP_EVENT_DQUOTE , &token) <0 ) goto fail; concat:
@@ -3219,11 +3219,11 @@ static int event_read_print(struct tep_event_format *event)/* ok to have no arg */ type =read_token_item (&token); -if (type ==EVENT_NONE ) +if (type ==TEP_EVENT_NONE )return 0 ;/* Handle concatenation of print lines */ -if (type ==EVENT_DQUOTE ) { +if (type ==TEP_EVENT_DQUOTE ) {char *cat;if (asprintf (&cat,"%s%s" , event->print_fmt.format, token) <0 )
@@ -3235,7 +3235,7 @@ static int event_read_print(struct tep_event_format *event) goto concat; } -if (test_type_token (type, token,EVENT_DELIM ,"," )) +if (test_type_token (type, token,TEP_EVENT_DELIM ,"," )) goto fail;free_token (token);
@@ -5617,7 +5617,7 @@ static int events_system_cmp(const void *a, const void *b)return events_id_cmp (a, b); } -struct tep_event_format **tep_list_events (struct tep_handle *pevent,enum event_sort_type sort_type) +struct tep_event_format **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type sort_type) {struct tep_event_format **events;int (*sort)(const void *a,const void *b);
@@ -5638,20 +5638,20 @@ struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_ pevent->sort_events = events;/* the internal events are sorted by id */ -if (sort_type ==EVENT_SORT_ID ) { +if (sort_type ==TEP_EVENT_SORT_ID ) { pevent->last_type = sort_type;return events; } }switch (sort_type) { -case EVENT_SORT_ID : +case TEP_EVENT_SORT_ID : sort = events_id_cmp;break ; -case EVENT_SORT_NAME : +case TEP_EVENT_SORT_NAME : sort = events_name_cmp;break ; -case EVENT_SORT_SYSTEM : +case TEP_EVENT_SORT_SYSTEM : sort = events_system_cmp;break ;default :
@@ -5834,13 +5834,13 @@ static void parse_header_field(const char *field, save_input_buf_ptr = input_buf_ptr; save_input_buf_siz = input_buf_siz; -if (read_expected (EVENT_ITEM ,"field" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"field" ) <0 )return ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return ;/* type */ -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail;free_token (token);
@@ -5848,42 +5848,42 @@ static void parse_header_field(const char *field,* If this is not a mandatory field, then test it first. */ if (mandatory) { -if (read_expected (EVENT_ITEM , field) <0 ) +if (read_expected (TEP_EVENT_ITEM , field) <0 )return ; }else { -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail;if (strcmp (token, field) !=0 ) goto discard;free_token (token); } -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 )return ; -if (read_expected (EVENT_ITEM ,"offset" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"offset" ) <0 )return ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return ; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail; *offset =atoi (token);free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 )return ; -if (read_expected (EVENT_ITEM ,"size" ) <0 ) +if (read_expected (TEP_EVENT_ITEM ,"size" ) <0 )return ; -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return ; -if (read_expect_type (EVENT_ITEM , &token) <0 ) +if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto fail; *size =atoi (token);free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 )return ; type =read_token (&token); -if (type !=EVENT_NEWLINE ) { +if (type !=TEP_EVENT_NEWLINE ) {/* newer versions of the kernel have a "signed" type */ -if (type !=EVENT_ITEM ) +if (type !=TEP_EVENT_ITEM ) goto fail;if (strcmp (token,"signed" ) !=0 )
@@ -5891,17 +5891,17 @@ static void parse_header_field(const char *field,free_token (token); -if (read_expected (EVENT_OP ,":" ) <0 ) +if (read_expected (TEP_EVENT_OP ,":" ) <0 )return ; -if (read_expect_type (EVENT_ITEM , &token)) +if (read_expect_type (TEP_EVENT_ITEM , &token)) goto fail;free_token (token); -if (read_expected (EVENT_OP ,";" ) <0 ) +if (read_expected (TEP_EVENT_OP ,";" ) <0 )return ; -if (read_expect_type (EVENT_NEWLINE , &token)) +if (read_expect_type (TEP_EVENT_NEWLINE , &token)) goto fail; } fail:
tools/lib/traceevent/event-parse.h +17 -17
@@ -301,22 +301,22 @@ enum {EVENT_FL_FAILED =0x80000000 }; -enum event_sort_type { -EVENT_SORT_ID , -EVENT_SORT_NAME , -EVENT_SORT_SYSTEM , +enum tep_event_sort_type { +TEP_EVENT_SORT_ID , +TEP_EVENT_SORT_NAME , +TEP_EVENT_SORT_SYSTEM , }; -enum event_type { -EVENT_ERROR , -EVENT_NONE , -EVENT_SPACE , -EVENT_NEWLINE , -EVENT_OP , -EVENT_DELIM , -EVENT_ITEM , -EVENT_DQUOTE , -EVENT_SQUOTE , +enum tep_event_type { +TEP_EVENT_ERROR , +TEP_EVENT_NONE , +TEP_EVENT_SPACE , +TEP_EVENT_NEWLINE , +TEP_EVENT_OP , +TEP_EVENT_DELIM , +TEP_EVENT_ITEM , +TEP_EVENT_DQUOTE , +TEP_EVENT_SQUOTE , }; typedef unsigned long long (*tep_func_handler)(struct trace_seq *s,
@@ -454,7 +454,7 @@ struct tep_handle {struct tep_event_format **events;int nr_events;struct tep_event_format **sort_events; -enum event_sort_type last_type; +enum tep_event_sort_type last_type;int type_offset;int type_size;
@@ -685,7 +685,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event_format *event,int tep_strerror (struct tep_handle *pevent,enum tep_errno errnum,char *buf,size_t buflen); -struct tep_event_format **tep_list_events (struct tep_handle *pevent,enum event_sort_type ); +struct tep_event_format **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type );struct tep_format_field **tep_event_common_fields (struct tep_event_format *event);struct tep_format_field **tep_event_fields (struct tep_event_format *event);
@@ -756,7 +756,7 @@ void tep_unref(struct tep_handle *pevent);/* access to the internal parser */ void tep_buffer_init (const char *buf,unsigned long long size); -enum event_type tep_read_token (char **tok); +enum tep_event_type tep_read_token (char **tok);void tep_free_token (char *token);int tep_peek_char (void );const char *tep_get_input_buf (void );
tools/lib/traceevent/parse-filter.c +18 -18
@@ -61,15 +61,15 @@ static void free_token(char *token)tep_free_token (token); } -static enum event_type read_token (char **tok) +static enum tep_event_type read_token (char **tok) { -enum event_type type; +enum tep_event_type type;char *token =NULL ;do {free_token (token); type =tep_read_token (&token); - }while (type ==EVENT_NEWLINE || type ==EVENT_SPACE ); + }while (type ==TEP_EVENT_NEWLINE || type ==TEP_EVENT_SPACE );/* If token is = or ! check to see if the next char is ~ */ if (token &&
@@ -79,7 +79,7 @@ static enum event_type read_token(char **tok) *tok =malloc (3 );if (*tok ==NULL ) {free_token (token); -return EVENT_ERROR ; +return TEP_EVENT_ERROR ; }sprintf (*tok,"%c%c" , *token,'~' );free_token (token);
@@ -334,7 +334,7 @@ static void free_events(struct event_list *events)static enum tep_errno create_arg_item (struct tep_event_format *event,const char *token, -enum event_type type,struct filter_arg **parg,char *error_str) +enum tep_event_type type,struct filter_arg **parg,char *error_str) {struct tep_format_field *field;struct filter_arg *arg;
@@ -347,11 +347,11 @@ create_arg_item(struct tep_event_format *event, const char *token,switch (type) { -case EVENT_SQUOTE : -case EVENT_DQUOTE : +case TEP_EVENT_SQUOTE : +case TEP_EVENT_DQUOTE : arg->type =FILTER_ARG_VALUE ; arg->value.type = - type ==EVENT_DQUOTE ?FILTER_STRING :FILTER_CHAR ; + type ==TEP_EVENT_DQUOTE ?FILTER_STRING :FILTER_CHAR ; arg->value.str =strdup (token);if (!arg->value.str) {free_arg (arg);
@@ -359,7 +359,7 @@ create_arg_item(struct tep_event_format *event, const char *token,return TEP_ERRNO__MEM_ALLOC_FAILED ; }break ; -case EVENT_ITEM : +case TEP_EVENT_ITEM :/* if it is a number, then convert it */ if (isdigit (token[0 ])) { arg->type =FILTER_ARG_VALUE ;
@@ -942,7 +942,7 @@ static enum tep_errno process_filter(struct tep_event_format *event, struct filter_arg **parg, char *error_str, int not) { - enum event_type type; + enum tep_event_type type;char *token =NULL ;struct filter_arg *current_op =NULL ;struct filter_arg *current_exp =NULL ;
@@ -960,9 +960,9 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,free (token); type =read_token (&token);switch (type) { -case EVENT_SQUOTE : -case EVENT_DQUOTE : -case EVENT_ITEM : +case TEP_EVENT_SQUOTE : +case TEP_EVENT_DQUOTE : +case TEP_EVENT_ITEM : ret =create_arg_item (event, token, type, &arg, error_str);if (ret <0 ) goto fail;
@@ -987,7 +987,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, arg =NULL ;break ; -case EVENT_DELIM : +case TEP_EVENT_DELIM :if (*token ==',' ) {show_error (error_str,"Illegal token ','" ); ret =TEP_ERRNO__ILLEGAL_TOKEN ;
@@ -1054,7 +1054,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, }break ; -case EVENT_OP : +case TEP_EVENT_OP : op_type =process_op (token, &btype, &ctype, &etype);/* All expect a left arg except for NOT */
@@ -1139,14 +1139,14 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,if (ret <0 ) goto fail_syntax;break ; -case EVENT_NONE : +case TEP_EVENT_NONE :break ; -case EVENT_ERROR : +case TEP_EVENT_ERROR : goto fail_alloc;default : goto fail_syntax; } - }while (type !=EVENT_NONE ); + }while (type !=TEP_EVENT_NONE );if (!current_op && !current_exp) goto fail_syntax;
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 10/27 tools lib traceevent: Add prefix TEP_ to all EVENT_FL_* flags
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix TEP_ to all members of nameless enum EVENT_FL_*
--- tools/lib/traceevent/event-parse.c | 42 +++++++++++++++++++------------------- tools/lib/traceevent/event-parse.h | 18 ++++++++-------- 2 files changed, 30 insertions(+), 30 deletions(-)
tools/lib/traceevent/event-parse.c +21 -21
@@ -1382,7 +1382,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f* The ftrace fields may still use the "special" name. * Just ignore it. */ -if (event->flags &EVENT_FL_ISFTRACE && +if (event->flags &TEP_EVENT_FL_ISFTRACE && type ==TEP_EVENT_ITEM &&strcmp (token,"special" ) ==0 ) {free_token (token); type =read_token (&token);
@@ -1412,7 +1412,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f* Some of the ftrace fields are broken and have * an illegal "." in them. */ - (event->flags & EVENT_FL_ISFTRACE && + (event->flags & TEP_EVENT_FL_ISFTRACE && type == TEP_EVENT_OP && strcmp(token, ".") == 0)) {if (strcmp (token,"*" ) ==0 )
@@ -1963,7 +1963,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) arg->op.right =NULL ;if (set_op_prio (arg) ==-1 ) { - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ;/* arg->op.op (= token) will be freed at out_free */ arg->op.op =NULL ; goto out_free;
@@ -2042,7 +2042,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) }else {do_warning_event (event,"unknown op '%s'" , token); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ;/* the arg is now the left side */ goto out_free; }
@@ -4884,13 +4884,13 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_eint len;int ls; -if (event->flags &EVENT_FL_FAILED ) { +if (event->flags &TEP_EVENT_FL_FAILED ) {trace_seq_printf (s,"[FAILED TO PARSE]" );tep_print_fields (s, data, size, event);return ; } -if (event->flags &EVENT_FL_ISBPRINT ) { +if (event->flags &TEP_EVENT_FL_ISBPRINT ) { bprint_fmt =get_bprint_format (data, size, event); args =make_bprint_args (bprint_fmt, data, size, event); arg = args;
@@ -4945,7 +4945,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e/* The argument is the length. */ if (!arg) {do_warning_event (event,"no argument match" ); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; goto out_failed; } len_arg =eval_num_arg (data, size, event, arg);
@@ -4998,7 +4998,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ecase 'u' :if (!arg) {do_warning_event (event,"no argument match" ); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; goto out_failed; }
@@ -5008,7 +5008,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e/* should never happen */ if (len >31 ) {do_warning_event (event,"bad format!" ); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; len =31 ; }
@@ -5074,13 +5074,13 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ebreak ;default :do_warning_event (event,"bad count (%d)" , ls); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; }break ;case 's' :if (!arg) {do_warning_event (event,"no matching argument" ); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; goto out_failed; }
@@ -5090,7 +5090,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e/* should never happen */ if (len >31 ) {do_warning_event (event,"bad format!" ); - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ; len =31 ; }
@@ -5115,7 +5115,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_etrace_seq_putc (s, *ptr); } -if (event->flags &EVENT_FL_FAILED ) { +if (event->flags &TEP_EVENT_FL_FAILED ) { out_failed:trace_seq_printf (s,"[FAILED TO PARSE]" ); }
@@ -5391,11 +5391,11 @@ void tep_event_info(struct trace_seq *s, struct tep_event_format *event, {int print_pretty =1 ; -if (event->pevent->print_raw || (event->flags &EVENT_FL_PRINTRAW )) +if (event->pevent->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW ))tep_print_fields (s, record->data, record->size, event);else { -if (event->handler && !(event->flags &EVENT_FL_NOHANDLE )) +if (event->handler && !(event->flags &TEP_EVENT_FL_NOHANDLE )) print_pretty = event->handler (s, record, event, event->context);
@@ -6043,10 +6043,10 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp, }if (strcmp (sys,"ftrace" ) ==0 ) { - event->flags |=EVENT_FL_ISFTRACE ; + event->flags |=TEP_EVENT_FL_ISFTRACE ;if (strcmp (event->name,"bprint" ) ==0 ) - event->flags |=EVENT_FL_ISBPRINT ; + event->flags |=TEP_EVENT_FL_ISBPRINT ; } event->id =event_read_id ();
@@ -6089,7 +6089,7 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp, goto event_parse_failed; } -if (!ret && (event->flags &EVENT_FL_ISFTRACE )) { +if (!ret && (event->flags &TEP_EVENT_FL_ISFTRACE )) {struct tep_format_field *field;struct print_arg *arg, **list;
@@ -6098,13 +6098,13 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp,for (field = event->format.fields; field; field = field->next) { arg =alloc_arg ();if (!arg) { - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ;return TEP_ERRNO__OLD_FTRACE_ARG_FAILED ; } arg->type =PRINT_FIELD ; arg->field.name =strdup (field->name);if (!arg->field.name) { - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ;free_arg (arg);return TEP_ERRNO__OLD_FTRACE_ARG_FAILED ; }
@@ -6118,7 +6118,7 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp,return 0 ; event_parse_failed: - event->flags |=EVENT_FL_FAILED ; + event->flags |=TEP_EVENT_FL_FAILED ;return ret; event_alloc_failed:
tools/lib/traceevent/event-parse.h +9 -9
@@ -290,15 +290,15 @@ struct tep_event_format { };enum { -EVENT_FL_ISFTRACE =0x01 , -EVENT_FL_ISPRINT =0x02 , -EVENT_FL_ISBPRINT =0x04 , -EVENT_FL_ISFUNCENT =0x10 , -EVENT_FL_ISFUNCRET =0x20 , -EVENT_FL_NOHANDLE =0x40 , -EVENT_FL_PRINTRAW =0x80 , - -EVENT_FL_FAILED =0x80000000 +TEP_EVENT_FL_ISFTRACE =0x01 , +TEP_EVENT_FL_ISPRINT =0x02 , +TEP_EVENT_FL_ISBPRINT =0x04 , +TEP_EVENT_FL_ISFUNCENT =0x10 , +TEP_EVENT_FL_ISFUNCRET =0x20 , +TEP_EVENT_FL_NOHANDLE =0x40 , +TEP_EVENT_FL_PRINTRAW =0x80 , + +TEP_EVENT_FL_FAILED =0x80000000 };enum tep_event_sort_type {
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 11/27 tools lib traceevent, perf tools: Add prefix tep_ to all print_* structures
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to all print_* structures
--- tools/lib/traceevent/event-parse.c | 144 ++++++++++----------- tools/lib/traceevent/event-parse.h | 98 +++++++------- .../perf/util/scripting-engines/trace-event-perl.c | 6 +- .../util/scripting-engines/trace-event-python.c | 4 +- 4 files changed, 126 insertions(+), 126 deletions(-)
tools/lib/traceevent/event-parse.c +72 -72
@@ -95,7 +95,7 @@ struct tep_function_handler {static unsigned long long process_defined_func (struct trace_seq *s,void *data,int size, -struct tep_event_format *event,struct print_arg *arg); +struct tep_event_format *event,struct tep_print_arg *arg);static void free_func_handle (struct tep_function_handler *func);
@@ -118,9 +118,9 @@ void breakpoint(void) x++; } -struct print_arg *alloc_arg (void ) +struct tep_print_arg *alloc_arg (void ) { -return calloc (1 ,sizeof (struct print_arg )); +return calloc (1 ,sizeof (struct tep_print_arg )); }struct cmdline {
@@ -781,9 +781,9 @@ static int event_item_type(enum tep_event_type type) } } -static void free_flag_sym (struct print_flag_sym *fsym) +static void free_flag_sym (struct tep_print_flag_sym *fsym) { -struct print_flag_sym *next; +struct tep_print_flag_sym *next;while (fsym) { next = fsym->next;
@@ -794,9 +794,9 @@ static void free_flag_sym(struct print_flag_sym *fsym) } } -static void free_arg (struct print_arg *arg) +static void free_arg (struct tep_print_arg *arg) { -struct print_arg *farg; +struct tep_print_arg *farg;if (!arg)return ;
@@ -1674,11 +1674,11 @@ static int event_read_format(struct tep_event_format *event) }static enum tep_event_type -process_arg_token (struct tep_event_format *event,struct print_arg *arg, +process_arg_token (struct tep_event_format *event,struct tep_print_arg *arg,char **tok,enum tep_event_type type);static enum tep_event_type -process_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_arg (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {enum tep_event_type type;char *token;
@@ -1690,14 +1690,14 @@ process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok) }static enum tep_event_type -process_op (struct tep_event_format *event,struct print_arg *arg,char **tok); +process_op (struct tep_event_format *event,struct tep_print_arg *arg,char **tok);/* * For __print_symbolic() and __print_flags, we need to completely * evaluate the first argument, which defines what to print next. */ static enum tep_event_type -process_field_arg (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_field_arg (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {enum tep_event_type type;
@@ -1711,9 +1711,9 @@ process_field_arg(struct tep_event_format *event, struct print_arg *arg, char ** }static enum tep_event_type -process_cond (struct tep_event_format *event,struct print_arg *top,char **tok) +process_cond (struct tep_event_format *event,struct tep_print_arg *top,char **tok) { -struct print_arg *arg, *left, *right; +struct tep_print_arg *arg, *left, *right;enum tep_event_type type;char *token =NULL ;
@@ -1767,9 +1767,9 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) }static enum tep_event_type -process_array (struct tep_event_format *event,struct print_arg *top,char **tok) +process_array (struct tep_event_format *event,struct tep_print_arg *top,char **tok) { -struct print_arg *arg; +struct tep_print_arg *arg;enum tep_event_type type;char *token =NULL ;
@@ -1855,7 +1855,7 @@ static int get_op_prio(char *op) } } -static int set_op_prio (struct print_arg *arg) +static int set_op_prio (struct tep_print_arg *arg) {/* single ops are the greatest */
@@ -1869,9 +1869,9 @@ static int set_op_prio(struct print_arg *arg)/* Note, *tok does not get freed, but will most likely be saved */ static enum tep_event_type -process_op (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_op (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -struct print_arg *left, *right =NULL ; +struct tep_print_arg *left, *right =NULL ;enum tep_event_type type;char *token;
@@ -2009,7 +2009,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)if (right->type ==PRINT_OP &&get_op_prio (arg->op.op) <get_op_prio (right->op.op)) { -struct print_arg tmp; +struct tep_print_arg tmp;/* rotate ops according to the priority */ arg->op.right = right->op.left;
@@ -2070,7 +2070,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) }static enum tep_event_type -process_entry (struct tep_event_format *event__maybe_unused ,struct print_arg *arg, +process_entry (struct tep_event_format *event__maybe_unused ,struct tep_print_arg *arg,char **tok) {enum tep_event_type type;
@@ -2110,9 +2110,9 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *a }static int alloc_and_process_delim (struct tep_event_format *event,char *next_token, -struct print_arg **print_arg) +struct tep_print_arg **print_arg) { -struct print_arg *field; +struct tep_print_arg *field;enum tep_event_type type;char *token;int ret =0 ;
@@ -2141,7 +2141,7 @@ static int alloc_and_process_delim(struct tep_event_format *event, char *next_toreturn ret; } -static char *arg_eval (struct print_arg *arg); +static char *arg_eval (struct tep_print_arg *arg);static unsigned long long eval_type_str (unsigned long long val,const char *type,int pointer)
@@ -2238,7 +2238,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)* Try to figure out the type. */ static unsigned long long -eval_type (unsigned long long val,struct print_arg *arg,int pointer) +eval_type (unsigned long long val,struct tep_print_arg *arg,int pointer) {if (arg->type !=PRINT_TYPE ) {do_warning ("expected type argument" );
@@ -2248,7 +2248,7 @@ eval_type(unsigned long long val, struct print_arg *arg, int pointer)return eval_type_str (val, arg->typecast.type, pointer); } -static int arg_num_eval (struct print_arg *arg,long long *val) +static int arg_num_eval (struct tep_print_arg *arg,long long *val) {long long left, right;int ret =1 ;
@@ -2414,7 +2414,7 @@ static int arg_num_eval(struct print_arg *arg, long long *val)return ret; } -static char *arg_eval (struct print_arg *arg) +static char *arg_eval (struct tep_print_arg *arg) {long long val;static char buf[20 ];
@@ -2444,11 +2444,11 @@ static char *arg_eval (struct print_arg *arg) }static enum tep_event_type -process_fields (struct tep_event_format *event,struct print_flag_sym **list,char **tok) +process_fields (struct tep_event_format *event,struct tep_print_flag_sym **list,char **tok) {enum tep_event_type type; -struct print_arg *arg =NULL ; -struct print_flag_sym *field; +struct tep_print_arg *arg =NULL ; +struct tep_print_flag_sym *field;char *token = *tok;char *value;
@@ -2525,9 +2525,9 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha }static enum tep_event_type -process_flags (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_flags (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -struct print_arg *field; +struct tep_print_arg *field;enum tep_event_type type;char *token =NULL ;
@@ -2578,9 +2578,9 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) }static enum tep_event_type -process_symbols (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_symbols (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -struct print_arg *field; +struct tep_print_arg *field;enum tep_event_type type;char *token =NULL ;
@@ -2617,7 +2617,7 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to }static enum tep_event_type -process_hex_common (struct tep_event_format *event,struct print_arg *arg, +process_hex_common (struct tep_event_format *event,struct tep_print_arg *arg,char **tok,enum print_arg_type type) {memset (arg,0 ,sizeof (*arg));
@@ -2640,20 +2640,20 @@ process_hex_common(struct tep_event_format *event, struct print_arg *arg, }static enum tep_event_type -process_hex (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_hex (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX ); }static enum tep_event_type -process_hex_str (struct tep_event_format *event,struct print_arg *arg, +process_hex_str (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {return process_hex_common (event, arg, tok,PRINT_HEX_STR ); }static enum tep_event_type -process_int_array (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_int_array (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {memset (arg,0 ,sizeof (*arg)); arg->type =PRINT_INT_ARRAY ;
@@ -2681,7 +2681,7 @@ process_int_array(struct tep_event_format *event, struct print_arg *arg, char ** }static enum tep_event_type -process_dynamic_array (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_dynamic_array (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {struct tep_format_field *field;enum tep_event_type type;
@@ -2745,7 +2745,7 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha }static enum tep_event_type -process_dynamic_array_len (struct tep_event_format *event,struct print_arg *arg, +process_dynamic_array_len (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {struct tep_format_field *field;
@@ -2781,9 +2781,9 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, }static enum tep_event_type -process_paren (struct tep_event_format *event,struct print_arg *arg,char **tok) +process_paren (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -struct print_arg *item_arg; +struct tep_print_arg *item_arg;enum tep_event_type type;char *token;
@@ -2844,7 +2844,7 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok)static enum tep_event_type -process_str (struct tep_event_format *event__maybe_unused ,struct print_arg *arg, +process_str (struct tep_event_format *event__maybe_unused ,struct tep_print_arg *arg,char **tok) {enum tep_event_type type;
@@ -2873,7 +2873,7 @@ process_str(struct tep_event_format *event __maybe_unused, struct print_arg *arg }static enum tep_event_type -process_bitmask (struct tep_event_format *event__maybe_unused ,struct print_arg *arg, +process_bitmask (struct tep_event_format *event__maybe_unused ,struct tep_print_arg *arg,char **tok) {enum tep_event_type type;
@@ -2935,10 +2935,10 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name)static enum tep_event_type process_func_handler (struct tep_event_format *event,struct tep_function_handler *func, -struct print_arg *arg,char **tok) +struct tep_print_arg *arg,char **tok) { -struct print_arg **next_arg; -struct print_arg *farg; +struct tep_print_arg **next_arg; +struct tep_print_arg *farg;enum tep_event_type type;char *token;int i;
@@ -2992,7 +2992,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler }static enum tep_event_type -process_function (struct tep_event_format *event,struct print_arg *arg, +process_function (struct tep_event_format *event,struct tep_print_arg *arg,char *token,char **tok) {struct tep_function_handler *func;
@@ -3048,7 +3048,7 @@ process_function(struct tep_event_format *event, struct print_arg *arg, }static enum tep_event_type -process_arg_token (struct tep_event_format *event,struct print_arg *arg, +process_arg_token (struct tep_event_format *event,struct tep_print_arg *arg,char **tok,enum tep_event_type type) {char *token;
@@ -3136,10 +3136,10 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,return type; } -static int event_read_print_args (struct tep_event_format *event,struct print_arg **list) +static int event_read_print_args (struct tep_event_format *event,struct tep_print_arg **list) {enum tep_event_type type =TEP_EVENT_ERROR ; -struct print_arg *arg; +struct tep_print_arg *arg;char *token;int args =0 ;
@@ -3522,13 +3522,13 @@ tep_find_event_by_name(struct tep_handle *pevent, }static unsigned long long -eval_num_arg (void *data,int size,struct tep_event_format *event,struct print_arg *arg) +eval_num_arg (void *data,int size,struct tep_event_format *event,struct tep_print_arg *arg) {struct tep_handle *pevent = event->pevent;unsigned long long val =0 ;unsigned long long left, right; -struct print_arg *typearg =NULL ; -struct print_arg *larg; +struct tep_print_arg *typearg =NULL ; +struct tep_print_arg *larg;unsigned long offset;unsigned int field_size;
@@ -3863,10 +3863,10 @@ static void print_bitmask_to_seq(struct tep_handle *pevent,static void print_str_arg (struct trace_seq *s,void *data,int size,struct tep_event_format *event,const char *format, -int len_arg,struct print_arg *arg) +int len_arg,struct tep_print_arg *arg) {struct tep_handle *pevent = event->pevent; -struct print_flag_sym *flag; +struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;long long val, fval;
@@ -4117,13 +4117,13 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,static unsigned long long process_defined_func (struct trace_seq *s,void *data,int size, -struct tep_event_format *event,struct print_arg *arg) +struct tep_event_format *event,struct tep_print_arg *arg) {struct tep_function_handler *func_handle = arg->func.func;struct func_params *param;unsigned long long *args;unsigned long long ret; -struct print_arg *farg; +struct tep_print_arg *farg;struct trace_seq str;struct save_str {struct save_str *next;
@@ -4200,9 +4200,9 @@ process_defined_func(struct trace_seq *s, void *data, int size,return ret; } -static void free_args (struct print_arg *args) +static void free_args (struct tep_print_arg *args) { -struct print_arg *next; +struct tep_print_arg *next;while (args) { next = args->next;
@@ -4212,11 +4212,11 @@ static void free_args(struct print_arg *args) } } -static struct print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event_format *event) +static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event_format *event) {struct tep_handle *pevent = event->pevent;struct tep_format_field *field, *ip_field; -struct print_arg *args, *arg, **next; +struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;char *ptr;void *bptr;
@@ -4424,7 +4424,7 @@ get_bprint_format(void *data, int size __maybe_unused, }static void print_mac_arg (struct trace_seq *s,int mac,void *data,int size, -struct tep_event_format *event,struct print_arg *arg) +struct tep_event_format *event,struct tep_print_arg *arg) {unsigned char *buf;const char *fmt ="%.2x:%.2x:%.2x:%.2x:%.2x:%.2x" ;
@@ -4578,7 +4578,7 @@ static void print_ip6_addr(struct trace_seq *s, char i, unsigned char *buf)*/ static int print_ipv4_arg (struct trace_seq *s,const char *ptr,char i,void *data,int size,struct tep_event_format *event, -struct print_arg *arg) +struct tep_print_arg *arg) {unsigned char *buf;
@@ -4615,7 +4615,7 @@ static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i,static int print_ipv6_arg (struct trace_seq *s,const char *ptr,char i,void *data,int size,struct tep_event_format *event, -struct print_arg *arg) +struct tep_print_arg *arg) {char have_c =0 ;unsigned char *buf;
@@ -4665,7 +4665,7 @@ static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i,static int print_ipsa_arg (struct trace_seq *s,const char *ptr,char i,void *data,int size,struct tep_event_format *event, -struct print_arg *arg) +struct tep_print_arg *arg) {char have_c =0 , have_p =0 ;unsigned char *buf;
@@ -4747,7 +4747,7 @@ static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i,static int print_ip_arg (struct trace_seq *s,const char *ptr,void *data,int size,struct tep_event_format *event, -struct print_arg *arg) +struct tep_print_arg *arg) {char i = *ptr;/* 'i' or 'I' */ char ver;
@@ -4868,9 +4868,9 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event_format *event) {struct tep_handle *pevent = event->pevent; -struct print_fmt *print_fmt = &event->print_fmt; -struct print_arg *arg = print_fmt->args; -struct print_arg *args =NULL ; +struct tep_print_fmt *print_fmt = &event->print_fmt; +struct tep_print_arg *arg = print_fmt->args; +struct tep_print_arg *args =NULL ;const char *ptr = print_fmt->format;unsigned long long val;struct func_map *func;
@@ -5723,7 +5723,7 @@ struct tep_format_field **tep_event_fields(struct tep_event_format *event) event->format.fields); } -static void print_fields (struct trace_seq *s,struct print_flag_sym *field) +static void print_fields (struct trace_seq *s,struct tep_print_flag_sym *field) {trace_seq_printf (s,"{ %s, %s }" , field->value, field->str);if (field->next) {
@@ -5733,7 +5733,7 @@ static void print_fields(struct trace_seq *s, struct print_flag_sym *field) }/* for debugging */ -static void print_args (struct print_arg *args) +static void print_args (struct tep_print_arg *args) {int print_paren =1 ;struct trace_seq s;
@@ -6091,7 +6091,7 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp,if (!ret && (event->flags &TEP_EVENT_FL_ISFTRACE )) {struct tep_format_field *field; -struct print_arg *arg, **list; +struct tep_print_arg *arg, **list;/* old ftrace had no args */ list = &event->print_fmt.args;
tools/lib/traceevent/event-parse.h +49 -49
161 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-perl.c +3 -3
@@ -99,7 +99,7 @@ static void define_symbolic_value(const char *ev_name,LEAVE ; } -static void define_symbolic_values (struct print_flag_sym *field, +static void define_symbolic_values (struct tep_print_flag_sym *field,const char *ev_name,const char *field_name) {
@@ -157,7 +157,7 @@ static void define_flag_value(const char *ev_name,LEAVE ; } -static void define_flag_values (struct print_flag_sym *field, +static void define_flag_values (struct tep_print_flag_sym *field,const char *ev_name,const char *field_name) {
@@ -191,7 +191,7 @@ static void define_flag_field(const char *ev_name,static void define_event_symbols (struct tep_event_format *event,const char *ev_name, -struct print_arg *args) +struct tep_print_arg *args) {if (args ==NULL )return ;
tools/perf/util/scripting-engines/trace-event-python.c +2 -2
@@ -224,7 +224,7 @@ static void define_value(enum print_arg_type field_type, }static void define_values (enum print_arg_type field_type, -struct print_flag_sym *field, +struct tep_print_flag_sym *field,const char *ev_name,const char *field_name) {
@@ -266,7 +266,7 @@ static void define_field(enum print_arg_type field_type,static void define_event_symbols (struct tep_event_format *event,const char *ev_name, -struct print_arg *args) +struct tep_print_arg *args) {if (args ==NULL )return ;
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 12/27 tools lib traceevent, perf tools: Rename enum print_arg_type to enum tep_print_arg_type
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames enum print_arg_type to enum tep_print_arg_type and add prefix TEP_ to all its members.
--- tools/lib/traceevent/event-parse.c | 248 ++++++++++----------- tools/lib/traceevent/event-parse.h | 36 +-- .../perf/util/scripting-engines/trace-event-perl.c | 32 +-- .../util/scripting-engines/trace-event-python.c | 56 ++--- 4 files changed, 186 insertions(+), 186 deletions(-)
tools/lib/traceevent/event-parse.c +124 -124
@@ -802,52 +802,52 @@ static void free_arg(struct tep_print_arg *arg)return ;switch (arg->type) { -case PRINT_ATOM : +case TEP_PRINT_ATOM :free (arg->atom.atom);break ; -case PRINT_FIELD : +case TEP_PRINT_FIELD :free (arg->field.name);break ; -case PRINT_FLAGS : +case TEP_PRINT_FLAGS :free_arg (arg->flags.field);free (arg->flags.delim);free_flag_sym (arg->flags.flags);break ; -case PRINT_SYMBOL : +case TEP_PRINT_SYMBOL :free_arg (arg->symbol.field);free_flag_sym (arg->symbol.symbols);break ; -case PRINT_HEX : -case PRINT_HEX_STR : +case TEP_PRINT_HEX : +case TEP_PRINT_HEX_STR :free_arg (arg->hex.field);free_arg (arg->hex.size);break ; -case PRINT_INT_ARRAY : +case TEP_PRINT_INT_ARRAY :free_arg (arg->int_array.field);free_arg (arg->int_array.count);free_arg (arg->int_array.el_size);break ; -case PRINT_TYPE : +case TEP_PRINT_TYPE :free (arg->typecast.type);free_arg (arg->typecast.item);break ; -case PRINT_STRING : -case PRINT_BSTRING : +case TEP_PRINT_STRING : +case TEP_PRINT_BSTRING :free (arg->string.string);break ; -case PRINT_BITMASK : +case TEP_PRINT_BITMASK :free (arg->bitmask.bitmask);break ; -case PRINT_DYNAMIC_ARRAY : -case PRINT_DYNAMIC_ARRAY_LEN : +case TEP_PRINT_DYNAMIC_ARRAY : +case TEP_PRINT_DYNAMIC_ARRAY_LEN :free (arg->dynarray.index);break ; -case PRINT_OP : +case TEP_PRINT_OP :free (arg->op.op);free_arg (arg->op.left);free_arg (arg->op.right);break ; -case PRINT_FUNC : +case TEP_PRINT_FUNC :while (arg->func.args) { farg = arg->func.args; arg->func.args = farg->next;
@@ -855,7 +855,7 @@ static void free_arg(struct tep_print_arg *arg) }break ; -case PRINT_NULL : +case TEP_PRINT_NULL :default :break ; }
@@ -1729,7 +1729,7 @@ process_cond(struct tep_event_format *event, struct tep_print_arg *top, char **t goto out_free; } - arg->type =PRINT_OP ; + arg->type =TEP_PRINT_OP ; arg->op.left = left; arg->op.right = right;
@@ -1859,7 +1859,7 @@ static int set_op_prio(struct tep_print_arg *arg) {/* single ops are the greatest */ -if (!arg->op.left || arg->op.left->type ==PRINT_NULL ) +if (!arg->op.left || arg->op.left->type ==TEP_PRINT_NULL ) arg->op.prio =0 ;else arg->op.prio =get_op_prio (arg->op.op);
@@ -1878,7 +1878,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok/* the op is passed in via tok */ token = *tok; -if (arg->type ==PRINT_OP && !arg->op.left) { +if (arg->type ==TEP_PRINT_OP && !arg->op.left) {/* handle single op */ if (token[1 ]) {do_warning_event (event,"bad op token %s" , token);
@@ -1901,7 +1901,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tokif (!left) goto out_warn_free; - left->type =PRINT_NULL ; + left->type =TEP_PRINT_NULL ; arg->op.left = left; right =alloc_arg ();
@@ -1923,7 +1923,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok/* copy the top arg to the left */ *left = *arg; - arg->type =PRINT_OP ; + arg->type =TEP_PRINT_OP ; arg->op.op = token; arg->op.left = left; arg->op.prio =0 ;
@@ -1957,7 +1957,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok/* copy the top arg to the left */ *left = *arg; - arg->type =PRINT_OP ; + arg->type =TEP_PRINT_OP ; arg->op.op = token; arg->op.left = left; arg->op.right =NULL ;
@@ -1977,7 +1977,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok type == TEP_EVENT_DELIM && (strcmp(token, ")") == 0)) {char *new_atom; -if (left->type !=PRINT_ATOM ) { +if (left->type !=TEP_PRINT_ATOM ) {do_warning_event (event,"bad pointer type" ); goto out_free; }
@@ -2007,7 +2007,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok goto out_free; } -if (right->type ==PRINT_OP && +if (right->type ==TEP_PRINT_OP &&get_op_prio (arg->op.op) <get_op_prio (right->op.op)) {struct tep_print_arg tmp;
@@ -2031,7 +2031,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok *left = *arg; - arg->type =PRINT_OP ; + arg->type =TEP_PRINT_OP ; arg->op.op = token; arg->op.left = left;
@@ -2084,7 +2084,7 @@ process_entry(struct tep_event_format *event __maybe_unused, struct tep_print_ar goto out_free; field = token; - arg->type =PRINT_FIELD ; + arg->type =TEP_PRINT_FIELD ; arg->field.name = field;if (is_flag_field) {
@@ -2240,7 +2240,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)static unsigned long long eval_type (unsigned long long val,struct tep_print_arg *arg,int pointer) { -if (arg->type !=PRINT_TYPE ) { +if (arg->type !=TEP_PRINT_TYPE ) {do_warning ("expected type argument" );return 0 ; }
@@ -2254,16 +2254,16 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val)int ret =1 ;switch (arg->type) { -case PRINT_ATOM : +case TEP_PRINT_ATOM : *val =strtoll (arg->atom.atom,NULL ,0 );break ; -case PRINT_TYPE : +case TEP_PRINT_TYPE : ret =arg_num_eval (arg->typecast.item, val);if (!ret)break ; *val =eval_type (*val, arg,0 );break ; -case PRINT_OP : +case TEP_PRINT_OP :switch (arg->op.op[0 ]) {case '|' : ret =arg_num_eval (arg->op.left, &left);
@@ -2366,7 +2366,7 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val)break ;case '-' :/* check for negative */ -if (arg->op.left->type ==PRINT_NULL ) +if (arg->op.left->type ==TEP_PRINT_NULL ) left =0 ;else ret =arg_num_eval (arg->op.left, &left);
@@ -2378,7 +2378,7 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val) *val = left - right;break ;case '+' : -if (arg->op.left->type ==PRINT_NULL ) +if (arg->op.left->type ==TEP_PRINT_NULL ) left =0 ;else ret =arg_num_eval (arg->op.left, &left);
@@ -2401,11 +2401,11 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val) }break ; -case PRINT_NULL : - case PRINT_FIELD ... PRINT_SYMBOL: -case PRINT_STRING : -case PRINT_BSTRING : -case PRINT_BITMASK : +case TEP_PRINT_NULL : + case TEP_PRINT_FIELD ... TEP_PRINT_SYMBOL: +case TEP_PRINT_STRING : +case TEP_PRINT_BSTRING : +case TEP_PRINT_BITMASK :default :do_warning ("invalid eval type %d" , arg->type); ret =0 ;
@@ -2420,21 +2420,21 @@ static char *arg_eval (struct tep_print_arg *arg)static char buf[20 ];switch (arg->type) { -case PRINT_ATOM : +case TEP_PRINT_ATOM :return arg->atom.atom; -case PRINT_TYPE : +case TEP_PRINT_TYPE :return arg_eval (arg->typecast.item); -case PRINT_OP : +case TEP_PRINT_OP :if (!arg_num_eval (arg, &val))break ;sprintf (buf,"%lld" , val);return buf; -case PRINT_NULL : - case PRINT_FIELD ... PRINT_SYMBOL: -case PRINT_STRING : -case PRINT_BSTRING : -case PRINT_BITMASK : +case TEP_PRINT_NULL : + case TEP_PRINT_FIELD ... TEP_PRINT_SYMBOL: +case TEP_PRINT_STRING : +case TEP_PRINT_BSTRING : +case TEP_PRINT_BITMASK :default :do_warning ("invalid eval type %d" , arg->type);break ;
@@ -2532,7 +2532,7 @@ process_flags(struct tep_event_format *event, struct tep_print_arg *arg, char **char *token =NULL ;memset (arg,0 ,sizeof (*arg)); - arg->type =PRINT_FLAGS ; + arg->type =TEP_PRINT_FLAGS ; field =alloc_arg ();if (!field) {
@@ -2585,7 +2585,7 @@ process_symbols(struct tep_event_format *event, struct tep_print_arg *arg, charchar *token =NULL ;memset (arg,0 ,sizeof (*arg)); - arg->type =PRINT_SYMBOL ; + arg->type =TEP_PRINT_SYMBOL ; field =alloc_arg ();if (!field) {
@@ -2618,7 +2618,7 @@ process_symbols(struct tep_event_format *event, struct tep_print_arg *arg, charstatic enum tep_event_type process_hex_common (struct tep_event_format *event,struct tep_print_arg *arg, -char **tok,enum print_arg_type type) +char **tok,enum tep_print_arg_type type) {memset (arg,0 ,sizeof (*arg)); arg->type = type;
@@ -2642,21 +2642,21 @@ process_hex_common(struct tep_event_format *event, struct tep_print_arg *arg,static enum tep_event_type process_hex (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -return process_hex_common (event, arg, tok,PRINT_HEX ); +return process_hex_common (event, arg, tok,TEP_PRINT_HEX ); }static enum tep_event_type process_hex_str (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) { -return process_hex_common (event, arg, tok,PRINT_HEX_STR ); +return process_hex_common (event, arg, tok,TEP_PRINT_HEX_STR ); }static enum tep_event_type process_int_array (struct tep_event_format *event,struct tep_print_arg *arg,char **tok) {memset (arg,0 ,sizeof (*arg)); - arg->type =PRINT_INT_ARRAY ; + arg->type =TEP_PRINT_INT_ARRAY ;if (alloc_and_process_delim (event,"," , &arg->int_array.field)) goto out;
@@ -2688,7 +2688,7 @@ process_dynamic_array(struct tep_event_format *event, struct tep_print_arg *arg,char *token;memset (arg,0 ,sizeof (*arg)); - arg->type =PRINT_DYNAMIC_ARRAY ; + arg->type =TEP_PRINT_DYNAMIC_ARRAY ;/* * The item within the parenthesis is another field that holds
@@ -2755,7 +2755,7 @@ process_dynamic_array_len(struct tep_event_format *event, struct tep_print_arg *if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; - arg->type =PRINT_DYNAMIC_ARRAY_LEN ; + arg->type =TEP_PRINT_DYNAMIC_ARRAY_LEN ;/* Find the field */ field =tep_find_field (event, token);
@@ -2814,8 +2814,8 @@ process_paren(struct tep_event_format *event, struct tep_print_arg *arg, char **/* make this a typecast and contine */ /* prevous must be an atom */ -if (arg->type !=PRINT_ATOM ) { -do_warning_event (event,"previous needed to be PRINT_ATOM" ); +if (arg->type !=TEP_PRINT_ATOM ) { +do_warning_event (event,"previous needed to be TEP_PRINT_ATOM" ); goto out_free; }
@@ -2826,7 +2826,7 @@ process_paren(struct tep_event_format *event, struct tep_print_arg *arg, char ** goto out_free; } - arg->type =PRINT_TYPE ; + arg->type =TEP_PRINT_TYPE ; arg->typecast.type = arg->atom.atom; arg->typecast.item = item_arg; type =process_arg_token (event, item_arg, &token, type);
@@ -2853,7 +2853,7 @@ process_str(struct tep_event_format *event __maybe_unused, struct tep_print_argif (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; - arg->type =PRINT_STRING ; + arg->type =TEP_PRINT_STRING ; arg->string.string = token; arg->string.offset =-1 ;
@@ -2882,7 +2882,7 @@ process_bitmask(struct tep_event_format *event __maybe_unused, struct tep_print_if (read_expect_type (TEP_EVENT_ITEM , &token) <0 ) goto out_free; - arg->type =PRINT_BITMASK ; + arg->type =TEP_PRINT_BITMASK ; arg->bitmask.bitmask = token; arg->bitmask.offset =-1 ;
@@ -2943,7 +2943,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handlerchar *token;int i; - arg->type =PRINT_FUNC ; + arg->type =TEP_PRINT_FUNC ; arg->func.func = func; *tok =NULL ;
@@ -3096,13 +3096,13 @@ process_arg_token(struct tep_event_format *event, struct tep_print_arg *arg, type =read_token_item (&token); } - arg->type =PRINT_ATOM ; + arg->type =TEP_PRINT_ATOM ; arg->atom.atom = atom;break ;case TEP_EVENT_DQUOTE :case TEP_EVENT_SQUOTE : - arg->type =PRINT_ATOM ; + arg->type =TEP_PRINT_ATOM ; arg->atom.atom = token; type =read_token_item (&token);break ;
@@ -3114,7 +3114,7 @@ process_arg_token(struct tep_event_format *event, struct tep_print_arg *arg, }case TEP_EVENT_OP :/* handle single ops */ - arg->type =PRINT_OP ; + arg->type =TEP_PRINT_OP ; arg->op.op = token; arg->op.left =NULL ; type =process_op (event, arg, &token);
@@ -3533,12 +3533,12 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_prunsigned int field_size;switch (arg->type) { -case PRINT_NULL : +case TEP_PRINT_NULL :/* ?? */ return 0 ; -case PRINT_ATOM : +case TEP_PRINT_ATOM :return strtoull (arg->atom.atom,NULL ,0 ); -case PRINT_FIELD : +case TEP_PRINT_FIELD :if (!arg->field.field) { arg->field.field =tep_find_any_field (event, arg->field.name);if (!arg->field.field)
@@ -3549,27 +3549,27 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr val =tep_read_number (pevent, data + arg->field.field->offset, arg->field.field->size);break ; -case PRINT_FLAGS : -case PRINT_SYMBOL : -case PRINT_INT_ARRAY : -case PRINT_HEX : -case PRINT_HEX_STR : +case TEP_PRINT_FLAGS : +case TEP_PRINT_SYMBOL : +case TEP_PRINT_INT_ARRAY : +case TEP_PRINT_HEX : +case TEP_PRINT_HEX_STR :break ; -case PRINT_TYPE : +case TEP_PRINT_TYPE : val =eval_num_arg (data, size, event, arg->typecast.item);return eval_type (val, arg,0 ); -case PRINT_STRING : -case PRINT_BSTRING : -case PRINT_BITMASK : +case TEP_PRINT_STRING : +case TEP_PRINT_BSTRING : +case TEP_PRINT_BITMASK :return 0 ; -case PRINT_FUNC : { +case TEP_PRINT_FUNC : {struct trace_seq s;trace_seq_init (&s); val =process_defined_func (&s, data, size, event, arg);trace_seq_destroy (&s);return val; } -case PRINT_OP : +case TEP_PRINT_OP :if (strcmp (arg->op.op,"[" ) ==0 ) {/* * Arrays are special, since we don't want
@@ -3579,7 +3579,7 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr/* handle typecasts */ larg = arg->op.left; -while (larg->type ==PRINT_TYPE ) { +while (larg->type ==TEP_PRINT_TYPE ) {if (!typearg) typearg = larg; larg = larg->typecast.item;
@@ -3589,7 +3589,7 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr field_size = pevent->long_size;switch (larg->type) { -case PRINT_DYNAMIC_ARRAY : +case TEP_PRINT_DYNAMIC_ARRAY : offset =tep_read_number (pevent, data + larg->dynarray.field->offset, larg->dynarray.field->size);
@@ -3603,7 +3603,7 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr offset &=0xffff ; offset += right;break ; -case PRINT_FIELD : +case TEP_PRINT_FIELD :if (!larg->field.field) { larg->field.field =tep_find_any_field (event, larg->field.name);
@@ -3719,7 +3719,7 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr goto out_warning_op; }break ; -case PRINT_DYNAMIC_ARRAY_LEN : +case TEP_PRINT_DYNAMIC_ARRAY_LEN : offset =tep_read_number (pevent, data + arg->dynarray.field->offset, arg->dynarray.field->size);
@@ -3730,7 +3730,7 @@ eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_pr*/ val = (unsigned long long )(offset >>16 );break ; -case PRINT_DYNAMIC_ARRAY : +case TEP_PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ offset = tep_read_number(pevent, data + arg->dynarray.field->offset,
@@ -3877,13 +3877,13 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,int i, len;switch (arg->type) { -case PRINT_NULL : +case TEP_PRINT_NULL :/* ?? */ return ; -case PRINT_ATOM : +case TEP_PRINT_ATOM :print_str_to_seq (s, format, len_arg, arg->atom.atom);return ; -case PRINT_FIELD : +case TEP_PRINT_FIELD : field = arg->field.field;if (!field) { field =tep_find_any_field (event, arg->field.name);
@@ -3940,7 +3940,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,print_str_to_seq (s, format, len_arg, str);free (str);break ; -case PRINT_FLAGS : +case TEP_PRINT_FLAGS : val =eval_num_arg (data, size, event, arg->flags.field); print =0 ;for (flag = arg->flags.flags; flag; flag = flag->next) {
@@ -3963,7 +3963,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,trace_seq_printf (s,"0x%llx" , val); }break ; -case PRINT_SYMBOL : +case TEP_PRINT_SYMBOL : val =eval_num_arg (data, size, event, arg->symbol.field);for (flag = arg->symbol.symbols; flag; flag = flag->next) { fval =eval_flag (flag->value);
@@ -3975,9 +3975,9 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,if (!flag)trace_seq_printf (s,"0x%llx" , val);break ; -case PRINT_HEX : -case PRINT_HEX_STR : -if (arg->hex.field->type ==PRINT_DYNAMIC_ARRAY ) { +case TEP_PRINT_HEX : +case TEP_PRINT_HEX_STR : +if (arg->hex.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset; offset = tep_read_number(pevent, data + arg->hex.field->dynarray.field->offset,
@@ -3996,17 +3996,17 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, } len =eval_num_arg (data, size, event, arg->hex.size);for (i =0 ; i < len; i++) { -if (i && arg->type ==PRINT_HEX ) +if (i && arg->type ==TEP_PRINT_HEX )trace_seq_putc (s,' ' );trace_seq_printf (s,"%02x" , hex[i]); }break ; -case PRINT_INT_ARRAY : { +case TEP_PRINT_INT_ARRAY : {void *num;int el_size; -if (arg->int_array.field->type ==PRINT_DYNAMIC_ARRAY ) { +if (arg->int_array.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset;struct tep_format_field *field = arg->int_array.field->dynarray.field;
@@ -4050,9 +4050,9 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, }break ; } -case PRINT_TYPE : +case TEP_PRINT_TYPE :break ; -case PRINT_STRING : { +case TEP_PRINT_STRING : {int str_offset;if (arg->string.offset ==-1 ) {
@@ -4066,10 +4066,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ; } -case PRINT_BSTRING : +case TEP_PRINT_BSTRING :print_str_to_seq (s, format, len_arg, arg->string.string);break ; -case PRINT_BITMASK : { +case TEP_PRINT_BITMASK : {int bitmask_offset;int bitmask_size;
@@ -4086,7 +4086,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, data + bitmask_offset, bitmask_size);break ; } -case PRINT_OP : +case TEP_PRINT_OP :/* * The only op for string should be ? : */
@@ -4100,7 +4100,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,print_str_arg (s, data, size, event, format, len_arg, arg->op.right->op.right);break ; -case PRINT_FUNC : +case TEP_PRINT_FUNC :process_defined_func (s, data, size, event, arg);break ;default :
@@ -4255,7 +4255,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s arg->next =NULL ; next = &arg->next; - arg->type =PRINT_ATOM ; + arg->type =TEP_PRINT_ATOM ;if (asprintf (&arg->atom.atom,"%lld" , ip) <0 ) goto out_free;
@@ -4343,7 +4343,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s goto out_free; } arg->next =NULL ; - arg->type =PRINT_ATOM ; + arg->type =TEP_PRINT_ATOM ;if (asprintf (&arg->atom.atom,"%lld" , val) <0 ) {free (arg); goto out_free;
@@ -4367,7 +4367,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s goto out_free; } arg->next =NULL ; - arg->type =PRINT_BSTRING ; + arg->type =TEP_PRINT_BSTRING ; arg->string.string =strdup (bptr);if (!arg->string.string) goto out_free;
@@ -4429,12 +4429,12 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,unsigned char *buf;const char *fmt ="%.2x:%.2x:%.2x:%.2x:%.2x:%.2x" ; -if (arg->type ==PRINT_FUNC ) { +if (arg->type ==TEP_PRINT_FUNC ) {process_defined_func (s, data, size, event, arg);return ; } -if (arg->type !=PRINT_FIELD ) { +if (arg->type !=TEP_PRINT_FIELD ) {trace_seq_printf (s,"ARG TYPE NOT FIELD BUT %d" , arg->type);return ;
@@ -4582,12 +4582,12 @@ static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i, {unsigned char *buf; -if (arg->type ==PRINT_FUNC ) { +if (arg->type ==TEP_PRINT_FUNC ) {process_defined_func (s, data, size, event, arg);return 0 ; } -if (arg->type !=PRINT_FIELD ) { +if (arg->type !=TEP_PRINT_FIELD ) {trace_seq_printf (s,"ARG TYPE NOT FIELD BUT %d" , arg->type);return 0 ; }
@@ -4628,12 +4628,12 @@ static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i, rc++; } -if (arg->type ==PRINT_FUNC ) { +if (arg->type ==TEP_PRINT_FUNC ) {process_defined_func (s, data, size, event, arg);return rc; } -if (arg->type !=PRINT_FIELD ) { +if (arg->type !=TEP_PRINT_FIELD ) {trace_seq_printf (s,"ARG TYPE NOT FIELD BUT %d" , arg->type);return rc; }
@@ -4686,12 +4686,12 @@ static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i, } } -if (arg->type ==PRINT_FUNC ) { +if (arg->type ==TEP_PRINT_FUNC ) {process_defined_func (s, data, size, event, arg);return rc; } -if (arg->type !=PRINT_FIELD ) { +if (arg->type !=TEP_PRINT_FIELD ) {trace_seq_printf (s,"ARG TYPE NOT FIELD BUT %d" , arg->type);return rc; }
@@ -4967,7 +4967,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_eif (isalnum (ptr[1 ])) ptr++; -if (arg->type ==PRINT_BSTRING ) { +if (arg->type ==TEP_PRINT_BSTRING ) {trace_seq_puts (s, arg->string.string);break ; }
@@ -5739,16 +5739,16 @@ static void print_args(struct tep_print_arg *args)struct trace_seq s;switch (args->type) { -case PRINT_NULL : +case TEP_PRINT_NULL :printf ("null" );break ; -case PRINT_ATOM : +case TEP_PRINT_ATOM :printf ("%s" , args->atom.atom);break ; -case PRINT_FIELD : +case TEP_PRINT_FIELD :printf ("REC->%s" , args->field.name);break ; -case PRINT_FLAGS : +case TEP_PRINT_FLAGS :printf ("__print_flags(" );print_args (args->flags.field);printf (", %s, " , args->flags.delim);
@@ -5758,7 +5758,7 @@ static void print_args(struct tep_print_arg *args)trace_seq_destroy (&s);printf (")" );break ; -case PRINT_SYMBOL : +case TEP_PRINT_SYMBOL :printf ("__print_symbolic(" );print_args (args->symbol.field);printf (", " );
@@ -5768,21 +5768,21 @@ static void print_args(struct tep_print_arg *args)trace_seq_destroy (&s);printf (")" );break ; -case PRINT_HEX : +case TEP_PRINT_HEX :printf ("__print_hex(" );print_args (args->hex.field);printf (", " );print_args (args->hex.size);printf (")" );break ; -case PRINT_HEX_STR : +case TEP_PRINT_HEX_STR :printf ("__print_hex_str(" );print_args (args->hex.field);printf (", " );print_args (args->hex.size);printf (")" );break ; -case PRINT_INT_ARRAY : +case TEP_PRINT_INT_ARRAY :printf ("__print_array(" );print_args (args->int_array.field);printf (", " );
@@ -5791,18 +5791,18 @@ static void print_args(struct tep_print_arg *args)print_args (args->int_array.el_size);printf (")" );break ; -case PRINT_STRING : -case PRINT_BSTRING : +case TEP_PRINT_STRING : +case TEP_PRINT_BSTRING :printf ("__get_str(%s)" , args->string.string);break ; -case PRINT_BITMASK : +case TEP_PRINT_BITMASK :printf ("__get_bitmask(%s)" , args->bitmask.bitmask);break ; -case PRINT_TYPE : +case TEP_PRINT_TYPE :printf ("(%s)" , args->typecast.type);print_args (args->typecast.item);break ; -case PRINT_OP : +case TEP_PRINT_OP :if (strcmp (args->op.op,":" ) ==0 ) print_paren =0 ;if (print_paren)
@@ -6101,7 +6101,7 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp, event->flags |=TEP_EVENT_FL_FAILED ;return TEP_ERRNO__OLD_FTRACE_ARG_FAILED ; } - arg->type =PRINT_FIELD ; + arg->type =TEP_PRINT_FIELD ; arg->field.name =strdup (field->name);if (!arg->field.name) { event->flags |=TEP_EVENT_FL_FAILED ;
tools/lib/traceevent/event-parse.h +18 -18
@@ -234,28 +234,28 @@ struct tep_print_arg_func {struct tep_print_arg *args; }; -enum print_arg_type { -PRINT_NULL , -PRINT_ATOM , -PRINT_FIELD , -PRINT_FLAGS , -PRINT_SYMBOL , -PRINT_HEX , -PRINT_INT_ARRAY , -PRINT_TYPE , -PRINT_STRING , -PRINT_BSTRING , -PRINT_DYNAMIC_ARRAY , -PRINT_OP , -PRINT_FUNC , -PRINT_BITMASK , -PRINT_DYNAMIC_ARRAY_LEN , -PRINT_HEX_STR , +enum tep_print_arg_type { +TEP_PRINT_NULL , +TEP_PRINT_ATOM , +TEP_PRINT_FIELD , +TEP_PRINT_FLAGS , +TEP_PRINT_SYMBOL , +TEP_PRINT_HEX , +TEP_PRINT_INT_ARRAY , +TEP_PRINT_TYPE , +TEP_PRINT_STRING , +TEP_PRINT_BSTRING , +TEP_PRINT_DYNAMIC_ARRAY , +TEP_PRINT_OP , +TEP_PRINT_FUNC , +TEP_PRINT_BITMASK , +TEP_PRINT_DYNAMIC_ARRAY_LEN , +TEP_PRINT_HEX_STR , };struct tep_print_arg {struct tep_print_arg *next; -enum print_arg_type type; +enum tep_print_arg_type type;union {struct tep_print_arg_atom atom;struct tep_print_arg_field field;
tools/perf/util/scripting-engines/trace-event-perl.c +16 -16
@@ -197,54 +197,54 @@ static void define_event_symbols(struct tep_event_format *event,return ;switch (args->type) { -case PRINT_NULL : +case TEP_PRINT_NULL :break ; -case PRINT_ATOM : +case TEP_PRINT_ATOM :define_flag_value (ev_name, cur_field_name,"0" , args->atom.atom); zero_flag_atom =0 ;break ; -case PRINT_FIELD : +case TEP_PRINT_FIELD :free (cur_field_name); cur_field_name =strdup (args->field.name);break ; -case PRINT_FLAGS : +case TEP_PRINT_FLAGS :define_event_symbols (event, ev_name, args->flags.field);define_flag_field (ev_name, cur_field_name, args->flags.delim);define_flag_values (args->flags.flags, ev_name, cur_field_name);break ; -case PRINT_SYMBOL : +case TEP_PRINT_SYMBOL :define_event_symbols (event, ev_name, args->symbol.field);define_symbolic_field (ev_name, cur_field_name);define_symbolic_values (args->symbol.symbols, ev_name, cur_field_name);break ; -case PRINT_HEX : -case PRINT_HEX_STR : +case TEP_PRINT_HEX : +case TEP_PRINT_HEX_STR :define_event_symbols (event, ev_name, args->hex.field);define_event_symbols (event, ev_name, args->hex.size);break ; -case PRINT_INT_ARRAY : +case TEP_PRINT_INT_ARRAY :define_event_symbols (event, ev_name, args->int_array.field);define_event_symbols (event, ev_name, args->int_array.count);define_event_symbols (event, ev_name, args->int_array.el_size);break ; -case PRINT_BSTRING : -case PRINT_DYNAMIC_ARRAY : -case PRINT_DYNAMIC_ARRAY_LEN : -case PRINT_STRING : -case PRINT_BITMASK : +case TEP_PRINT_BSTRING : +case TEP_PRINT_DYNAMIC_ARRAY : +case TEP_PRINT_DYNAMIC_ARRAY_LEN : +case TEP_PRINT_STRING : +case TEP_PRINT_BITMASK :break ; -case PRINT_TYPE : +case TEP_PRINT_TYPE :define_event_symbols (event, ev_name, args->typecast.item);break ; -case PRINT_OP : +case TEP_PRINT_OP :if (strcmp (args->op.op,":" ) ==0 ) zero_flag_atom =1 ;define_event_symbols (event, ev_name, args->op.left);define_event_symbols (event, ev_name, args->op.right);break ; -case PRINT_FUNC : +case TEP_PRINT_FUNC :default :pr_err ("Unsupported print arg type\n" );/* we should warn... */
tools/perf/util/scripting-engines/trace-event-python.c +28 -28
130 lines not on this page · raw message
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 13/27 tools lib traceevent: Add prefix tep_ to enums filter_{boolean,op,cmp}_type
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to enums filter_boolean_type, filter_op_type, filter_cmp_type and all enum's members
--- tools/lib/traceevent/event-parse.h | 46 ++++++------ tools/lib/traceevent/parse-filter.c | 144 ++++++++++++++++++------------------ 2 files changed, 95 insertions(+), 95 deletions(-)
tools/lib/traceevent/event-parse.h +23 -23
@@ -768,29 +768,29 @@ void tep_print_printk(struct tep_handle *pevent);/* ----------------------- filtering ----------------------- */ -enum filter_boolean_type { -FILTER_FALSE , -FILTER_TRUE , +enum tep_filter_boolean_type { +TEP_FILTER_FALSE , +TEP_FILTER_TRUE , }; -enum filter_op_type { -FILTER_OP_AND =1 , -FILTER_OP_OR , -FILTER_OP_NOT , +enum tep_filter_op_type { +TEP_FILTER_OP_AND =1 , +TEP_FILTER_OP_OR , +TEP_FILTER_OP_NOT , }; -enum filter_cmp_type { -FILTER_CMP_NONE , -FILTER_CMP_EQ , -FILTER_CMP_NE , -FILTER_CMP_GT , -FILTER_CMP_LT , -FILTER_CMP_GE , -FILTER_CMP_LE , -FILTER_CMP_MATCH , -FILTER_CMP_NOT_MATCH , -FILTER_CMP_REGEX , -FILTER_CMP_NOT_REGEX , +enum tep_filter_cmp_type { +TEP_FILTER_CMP_NONE , +TEP_FILTER_CMP_EQ , +TEP_FILTER_CMP_NE , +TEP_FILTER_CMP_GT , +TEP_FILTER_CMP_LT , +TEP_FILTER_CMP_GE , +TEP_FILTER_CMP_LE , +TEP_FILTER_CMP_MATCH , +TEP_FILTER_CMP_NOT_MATCH , +TEP_FILTER_CMP_REGEX , +TEP_FILTER_CMP_NOT_REGEX , };enum filter_exp_type {
@@ -828,7 +828,7 @@ enum filter_value_type {struct fliter_arg ;struct filter_arg_boolean { -enum filter_boolean_type value; +enum tep_filter_boolean_type value; };struct filter_arg_field {
@@ -844,7 +844,7 @@ struct filter_arg_value { };struct filter_arg_op { -enum filter_op_type type; +enum tep_filter_op_type type;struct filter_arg *left;struct filter_arg *right; };
@@ -856,13 +856,13 @@ struct filter_arg_exp { };struct filter_arg_num { -enum filter_cmp_type type; +enum tep_filter_cmp_type type;struct filter_arg *left;struct filter_arg *right; };struct filter_arg_str { -enum filter_cmp_type type; +enum tep_filter_cmp_type type;struct tep_format_field *field;char *val;char *buffer;
tools/lib/traceevent/parse-filter.c +72 -72
376 lines not on this page · raw message
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 14/27 tools lib traceevent: Add prefix tep_ to enums filter_{exp,arg}_type
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to enums filter_exp_type, filter_arg_type and all enum's members
--- tools/lib/traceevent/event-parse.h | 56 +++++----- tools/lib/traceevent/parse-filter.c | 210 ++++++++++++++++++------------------ 2 files changed, 133 insertions(+), 133 deletions(-)
tools/lib/traceevent/event-parse.h +28 -28
@@ -793,30 +793,30 @@ enum tep_filter_cmp_type { TEP_FILTER_CMP_NOT_REGEX, }; -enum filter_exp_type { -FILTER_EXP_NONE , -FILTER_EXP_ADD , -FILTER_EXP_SUB , -FILTER_EXP_MUL , -FILTER_EXP_DIV , -FILTER_EXP_MOD , -FILTER_EXP_RSHIFT , -FILTER_EXP_LSHIFT , -FILTER_EXP_AND , -FILTER_EXP_OR , -FILTER_EXP_XOR , -FILTER_EXP_NOT , -}; - -enum filter_arg_type { -FILTER_ARG_NONE , -FILTER_ARG_BOOLEAN , -FILTER_ARG_VALUE , -FILTER_ARG_FIELD , -FILTER_ARG_EXP , -FILTER_ARG_OP , -FILTER_ARG_NUM , -FILTER_ARG_STR , +enum tep_filter_exp_type { +TEP_FILTER_EXP_NONE , +TEP_FILTER_EXP_ADD , +TEP_FILTER_EXP_SUB , +TEP_FILTER_EXP_MUL , +TEP_FILTER_EXP_DIV , +TEP_FILTER_EXP_MOD , +TEP_FILTER_EXP_RSHIFT , +TEP_FILTER_EXP_LSHIFT , +TEP_FILTER_EXP_AND , +TEP_FILTER_EXP_OR , +TEP_FILTER_EXP_XOR , +TEP_FILTER_EXP_NOT , +}; + +enum tep_filter_arg_type { +TEP_FILTER_ARG_NONE , +TEP_FILTER_ARG_BOOLEAN , +TEP_FILTER_ARG_VALUE , +TEP_FILTER_ARG_FIELD , +TEP_FILTER_ARG_EXP , +TEP_FILTER_ARG_OP , +TEP_FILTER_ARG_NUM , +TEP_FILTER_ARG_STR , };enum filter_value_type {
@@ -850,9 +850,9 @@ struct filter_arg_op { };struct filter_arg_exp { -enum filter_exp_type type; -struct filter_arg *left; -struct filter_arg *right; +enum tep_filter_exp_type type; +struct filter_arg *left; +struct filter_arg *right; };struct filter_arg_num {
@@ -870,7 +870,7 @@ struct filter_arg_str { };struct filter_arg { -enum filter_arg_type type; +enum tep_filter_arg_type type;union {struct filter_arg_boolean boolean;struct filter_arg_field field;
tools/lib/traceevent/parse-filter.c +105 -105
553 lines not on this page · raw message
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 15/27 tools lib traceevent: Add prefix tep_ to struct filter_{arg,value_type}
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to struct filter_arg, enum filter_value_type and all enum's members.
--- tools/lib/traceevent/event-parse.h | 28 ++++----- tools/lib/traceevent/parse-filter.c | 120 ++++++++++++++++++------------------ 2 files changed, 74 insertions(+), 74 deletions(-)
tools/lib/traceevent/event-parse.h +14 -14
@@ -819,13 +819,13 @@ enum tep_filter_arg_type { TEP_FILTER_ARG_STR, }; -enum filter_value_type { -FILTER_NUMBER , -FILTER_STRING , -FILTER_CHAR +enum tep_filter_value_type { +TEP_FILTER_NUMBER , +TEP_FILTER_STRING , +TEP_FILTER_CHAR }; -struct fliter_arg ; +struct tep_filter_arg ;struct filter_arg_boolean {enum tep_filter_boolean_type value;
@@ -836,7 +836,7 @@ struct filter_arg_field { };struct filter_arg_value { -enum filter_value_type type; +enum tep_filter_value_type type;union {char *str;unsigned long long val;
@@ -845,20 +845,20 @@ struct filter_arg_value {struct filter_arg_op {enum tep_filter_op_type type; -struct filter_arg *left; -struct filter_arg *right; +struct tep_filter_arg *left; +struct tep_filter_arg *right; };struct filter_arg_exp {enum tep_filter_exp_type type; -struct filter_arg *left; -struct filter_arg *right; +struct tep_filter_arg *left; +struct tep_filter_arg *right; };struct filter_arg_num {enum tep_filter_cmp_type type; -struct filter_arg *left; -struct filter_arg *right; +struct tep_filter_arg *left; +struct tep_filter_arg *right; };struct filter_arg_str {
@@ -869,7 +869,7 @@ struct filter_arg_str {regex_t reg; }; -struct filter_arg { +struct tep_filter_arg {enum tep_filter_arg_type type;union {struct filter_arg_boolean boolean;
@@ -885,7 +885,7 @@ struct filter_arg {struct filter_type {int event_id;struct tep_event_format *event; -struct filter_arg *filter; +struct tep_filter_arg *filter; };#define TEP_FILTER_ERROR_BUFSZ 1024
tools/lib/traceevent/parse-filter.c +60 -60
381 lines not on this page · raw message
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 16/27 tools lib traceevent: Add prefix tep_ to various structs filter_arg_*.
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to to various structs filter_arg_*..
--- tools/lib/traceevent/event-parse.h | 48 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
tools/lib/traceevent/event-parse.h +24 -24
@@ -827,15 +827,15 @@ enum tep_filter_value_type {struct tep_filter_arg ; -struct filter_arg_boolean { +struct tep_filter_arg_boolean {enum tep_filter_boolean_type value; }; -struct filter_arg_field { -struct tep_format_field *field; +struct tep_filter_arg_field { +struct tep_format_field *field; }; -struct filter_arg_value { +struct tep_filter_arg_value {enum tep_filter_value_type type;union {char *str;
@@ -843,42 +843,42 @@ struct filter_arg_value { }; }; -struct filter_arg_op { -enum tep_filter_op_type type; -struct tep_filter_arg *left; -struct tep_filter_arg *right; +struct tep_filter_arg_op { +enum tep_filter_op_type type; +struct tep_filter_arg *left; +struct tep_filter_arg *right; }; -struct filter_arg_exp { +struct tep_filter_arg_exp {enum tep_filter_exp_type type;struct tep_filter_arg *left;struct tep_filter_arg *right; }; -struct filter_arg_num { +struct tep_filter_arg_num {enum tep_filter_cmp_type type; -struct tep_filter_arg *left; -struct tep_filter_arg *right; +struct tep_filter_arg *left; +struct tep_filter_arg *right; }; -struct filter_arg_str { +struct tep_filter_arg_str {enum tep_filter_cmp_type type; -struct tep_format_field *field; -char *val; -char *buffer; -regex_t reg; +struct tep_format_field *field; +char *val; +char *buffer; +regex_t reg; };struct tep_filter_arg {enum tep_filter_arg_type type;union { -struct filter_arg_boolean boolean; -struct filter_arg_field field; -struct filter_arg_value value; -struct filter_arg_op op; -struct filter_arg_exp exp; -struct filter_arg_num num; -struct filter_arg_str str; +struct tep_filter_arg_boolean boolean; +struct tep_filter_arg_field field; +struct tep_filter_arg_value value; +struct tep_filter_arg_op op; +struct tep_filter_arg_exp exp; +struct tep_filter_arg_num num; +struct tep_filter_arg_str str; }; };
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 17/27 tools lib traceevent: Add prefix tep_ to structs filter_type and event_filter
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to structs filter_type and event_filter
--- tools/lib/traceevent/event-parse.h | 34 ++++++------- tools/lib/traceevent/parse-filter.c | 96 ++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 65 deletions(-)
tools/lib/traceevent/event-parse.h +17 -17
@@ -882,7 +882,7 @@ struct tep_filter_arg { }; }; -struct filter_type { +struct tep_filter_type {int event_id;struct tep_event_format *event;struct tep_filter_arg *filter;
@@ -890,14 +890,14 @@ struct filter_type {#define TEP_FILTER_ERROR_BUFSZ 1024 -struct event_filter { +struct tep_event_filter {struct tep_handle *pevent;int filters; -struct filter_type *event_filters; +struct tep_filter_type *event_filters;char error_buffer[TEP_FILTER_ERROR_BUFSZ ]; }; -struct event_filter *tep_filter_alloc (struct tep_handle *pevent); +struct tep_event_filter *tep_filter_alloc (struct tep_handle *pevent);/* for backward compatibility */ #define FILTER_NONE TEP_ERRNO__NO_FILTER
@@ -911,39 +911,39 @@ enum filter_trivial_type { FILTER_TRIVIAL_BOTH, }; -enum tep_errno tep_filter_add_filter_str (struct event_filter *filter, +enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str); -enum tep_errno tep_filter_match (struct event_filter *filter, +enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record); -int tep_filter_strerror (struct event_filter *filter,enum tep_errno err, +int tep_filter_strerror (struct tep_event_filter *filter,enum tep_errno err,char *buf,size_t buflen); -int tep_event_filtered (struct event_filter *filter, +int tep_event_filtered (struct tep_event_filter *filter,int event_id); -void tep_filter_reset (struct event_filter *filter); +void tep_filter_reset (struct tep_event_filter *filter); -int tep_filter_clear_trivial (struct event_filter *filter, +int tep_filter_clear_trivial (struct tep_event_filter *filter,enum filter_trivial_type type); -void tep_filter_free (struct event_filter *filter); +void tep_filter_free (struct tep_event_filter *filter); -char *tep_filter_make_string (struct event_filter *filter,int event_id); +char *tep_filter_make_string (struct tep_event_filter *filter,int event_id); -int tep_filter_remove_event (struct event_filter *filter, +int tep_filter_remove_event (struct tep_event_filter *filter,int event_id); -int tep_filter_event_has_trivial (struct event_filter *filter, +int tep_filter_event_has_trivial (struct tep_event_filter *filter,int event_id,enum filter_trivial_type type); -int tep_filter_copy (struct event_filter *dest,struct event_filter *source); +int tep_filter_copy (struct tep_event_filter *dest,struct tep_event_filter *source); -int tep_update_trivial (struct event_filter *dest,struct event_filter *source, +int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source,enum filter_trivial_type type); -int tep_filter_compare (struct event_filter *filter1,struct event_filter *filter2); +int tep_filter_compare (struct tep_event_filter *filter1,struct tep_event_filter *filter2);#endif /* _PARSE_EVENTS_H */
tools/lib/traceevent/parse-filter.c +48 -48
286 lines not on this page · raw message
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 18/27 tools lib traceevent: Rename struct plugin_list to struct tep_plugin_list
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames struct plugin_list to struct tep_plugin_list
--- tools/lib/traceevent/event-parse.h | 8 ++++---- tools/lib/traceevent/event-plugin.c | 18 +++++++++--------- tools/perf/util/trace-event.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-)
tools/lib/traceevent/event-parse.h +4 -4
@@ -389,12 +389,12 @@ enum tep_errno { };#undef _PE -struct plugin_list ; +struct tep_plugin_list ;#define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1)) -struct plugin_list *tep_load_plugins (struct tep_handle *pevent); -void tep_unload_plugins (struct plugin_list *plugin_list, +struct tep_plugin_list *tep_load_plugins (struct tep_handle *pevent); +void tep_unload_plugins (struct tep_plugin_list *plugin_list,struct tep_handle *pevent);char **tep_plugin_list_options (void );void tep_plugin_free_options_list (char **list);
@@ -403,7 +403,7 @@ int tep_plugin_add_options(const char *name,void tep_plugin_remove_options (struct tep_plugin_option *options);void tep_print_plugins (struct trace_seq *s,const char *prefix,const char *suffix, -const struct plugin_list *list); +const struct tep_plugin_list *list);struct cmdline ;struct cmdline_list ;
tools/lib/traceevent/event-plugin.c +9 -9
@@ -31,8 +31,8 @@ static struct trace_plugin_options {char *value; } *trace_plugin_options; -struct plugin_list { -struct plugin_list *next; +struct tep_plugin_list { +struct tep_plugin_list *next;char *name;void *handle; };
@@ -259,7 +259,7 @@ void tep_plugin_remove_options(struct tep_plugin_option *options)*/ void tep_print_plugins (struct trace_seq *s,const char *prefix,const char *suffix, -const struct plugin_list *list) +const struct tep_plugin_list *list) {while (list) {trace_seq_printf (s,"%s%s%s" , prefix, list->name, suffix);
@@ -271,9 +271,9 @@ static void load_plugin(struct tep_handle *pevent, const char *path, const char *file, void *data) { - struct plugin_list **plugin_list = data; + struct tep_plugin_list **plugin_list = data;tep_plugin_load_func func; -struct plugin_list *list; +struct tep_plugin_list *list;const char *alias;char *plugin;void *handle;
@@ -417,20 +417,20 @@ load_plugins(struct tep_handle *pevent, const char *suffix,free (path); } -struct plugin_list * +struct tep_plugin_list *tep_load_plugins (struct tep_handle *pevent) { -struct plugin_list *list =NULL ; +struct tep_plugin_list *list =NULL ;load_plugins (pevent,".so" , load_plugin, &list);return list; }void -tep_unload_plugins (struct plugin_list *plugin_list,struct tep_handle *pevent) +tep_unload_plugins (struct tep_plugin_list *plugin_list,struct tep_handle *pevent) {tep_plugin_unload_func func; -struct plugin_list *list; +struct tep_plugin_list *list;while (plugin_list) { list = plugin_list;
tools/perf/util/trace-event.h +2 -2
@@ -11,11 +11,11 @@ struct perf_sample;union perf_event ;struct perf_tool ;struct thread ; -struct plugin_list ; +struct tep_plugin_list ;struct trace_event {struct tep_handle *pevent; -struct plugin_list *plugin_list; +struct tep_plugin_list *plugin_list; };int trace_event__init (struct trace_event *t);
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 19/27 tools lib traceevent: Rename data2host*() APIs
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames data2host*() APIs
--- tools/lib/traceevent/event-parse.c | 10 +++++----- tools/lib/traceevent/event-parse.h | 14 +++++++------- tools/perf/util/trace-event-read.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-)
tools/lib/traceevent/event-parse.c +5 -5
@@ -3331,11 +3331,11 @@ unsigned long long tep_read_number(struct tep_handle *pevent,case 1 :return *(unsigned char *)ptr;case 2 : -return data2host2 (pevent, ptr); +return tep_data2host2 (pevent, ptr);case 4 : -return data2host4 (pevent, ptr); +return tep_data2host4 (pevent, ptr);case 8 : -return data2host8 (pevent, ptr); +return tep_data2host8 (pevent, ptr);default :/* BUG! */ return 0 ;
@@ -4061,7 +4061,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset; } - str_offset =data2host4 (pevent, data + arg->string.offset); + str_offset =tep_data2host4 (pevent, data + arg->string.offset); str_offset &=0xffff ;print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ;
@@ -4079,7 +4079,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset; } - bitmask_offset =data2host4 (pevent, data + arg->bitmask.offset); + bitmask_offset =tep_data2host4 (pevent, data + arg->bitmask.offset); bitmask_size = bitmask_offset >>16 ; bitmask_offset &=0xffff ; print_bitmask_to_seq(pevent, s, format, len_arg,
tools/lib/traceevent/event-parse.h +7 -7
@@ -496,7 +496,7 @@ static inline void tep_set_flag(struct tep_handle *pevent, int flag) }static inline unsigned short -__data2host2 (struct tep_handle *pevent,unsigned short data) +__tep_data2host2 (struct tep_handle *pevent,unsigned short data) {unsigned short swap;
@@ -510,7 +510,7 @@ __data2host2(struct tep_handle *pevent, unsigned short data) }static inline unsigned int -__data2host4 (struct tep_handle *pevent,unsigned int data) +__tep_data2host4 (struct tep_handle *pevent,unsigned int data) {unsigned int swap;
@@ -526,7 +526,7 @@ __data2host4(struct tep_handle *pevent, unsigned int data) }static inline unsigned long long -__data2host8 (struct tep_handle *pevent,unsigned long long data) +__tep_data2host8 (struct tep_handle *pevent,unsigned long long data) {unsigned long long swap;
@@ -545,14 +545,14 @@ __data2host8(struct tep_handle *pevent, unsigned long long data)return swap; } -#define data2host2 (pevent, ptr) __data2host2(pevent, *(unsigned short *)(ptr)) -#define data2host4 (pevent, ptr) __data2host4(pevent, *(unsigned int *)(ptr)) -#define data2host8 (pevent, ptr) \ +#define tep_data2host2 (pevent, ptr) __tep_data2host2(pevent, *(unsigned short *)(ptr)) +#define tep_data2host4 (pevent, ptr) __tep_data2host4(pevent, *(unsigned int *)(ptr)) +#define tep_data2host8 (pevent, ptr) \ ({ \ unsigned long long __val; \ \ memcpy(&__val, (ptr), sizeof(unsigned long long)); \ - __data2host8(pevent, __val); \ + __tep_data2host8(pevent, __val); \ })static inline int tep_host_bigendian (void )
tools/perf/util/trace-event-read.c +2 -2
@@ -102,7 +102,7 @@ static unsigned int read4(struct tep_handle *pevent)if (do_read (&data,4 ) <0 )return 0 ; -return __data2host4 (pevent, data); +return __tep_data2host4 (pevent, data); }static unsigned long long read8 (struct tep_handle *pevent)
@@ -111,7 +111,7 @@ static unsigned long long read8(struct tep_handle *pevent)if (do_read (&data,8 ) <0 )return 0 ; -return __data2host8 (pevent, data); +return __tep_data2host8 (pevent, data); }static char *read_string (void )
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 20/27 tools lib traceevent: Add prefix tep_ to enum filter_trivial_type
In reply to Arnaldo Carvalho de MeloFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to enum filter_trivial_type and all its members.
--- tools/lib/traceevent/event-parse.h | 14 +++++++------- tools/lib/traceevent/parse-filter.c | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-)
tools/lib/traceevent/event-parse.h +7 -7
@@ -905,10 +905,10 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent);#define FILTER_MISS TEP_ERRNO__FILTER_MISS#define FILTER_MATCH TEP_ERRNO__FILTER_MATCH -enum filter_trivial_type { -FILTER_TRIVIAL_FALSE , -FILTER_TRIVIAL_TRUE , -FILTER_TRIVIAL_BOTH , +enum tep_filter_trivial_type { +TEP_FILTER_TRIVIAL_FALSE , +TEP_FILTER_TRIVIAL_TRUE , +TEP_FILTER_TRIVIAL_BOTH , }; enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,
@@ -926,7 +926,7 @@ int tep_event_filtered(struct tep_event_filter *filter,void tep_filter_reset (struct tep_event_filter *filter);int tep_filter_clear_trivial (struct tep_event_filter *filter, -enum filter_trivial_type type); +enum tep_filter_trivial_type type);void tep_filter_free (struct tep_event_filter *filter);
@@ -937,12 +937,12 @@ int tep_filter_remove_event(struct tep_event_filter *filter,int tep_filter_event_has_trivial (struct tep_event_filter *filter,int event_id, -enum filter_trivial_type type); +enum tep_filter_trivial_type type);int tep_filter_copy (struct tep_event_filter *dest,struct tep_event_filter *source);int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source, -enum filter_trivial_type type); +enum tep_filter_trivial_type type);int tep_filter_compare (struct tep_event_filter *filter1,struct tep_event_filter *filter2);
tools/lib/traceevent/parse-filter.c +11 -11
@@ -1534,7 +1534,7 @@ int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *sour* events may have still been updated on error. */ int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source, -enum filter_trivial_type type) +enum tep_filter_trivial_type type) {struct tep_handle *src_pevent;struct tep_handle *dest_pevent;
@@ -1556,8 +1556,8 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s arg = filter_type->filter;if (arg->type !=TEP_FILTER_ARG_BOOLEAN )continue ; -if ((arg->boolean.value && type ==FILTER_TRIVIAL_FALSE ) || - (!arg->boolean.value && type ==FILTER_TRIVIAL_TRUE )) +if ((arg->boolean.value && type ==TEP_FILTER_TRIVIAL_FALSE ) || + (!arg->boolean.value && type ==TEP_FILTER_TRIVIAL_TRUE ))continue ; event = filter_type->event;
@@ -1593,7 +1593,7 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s* Returns 0 on success and -1 if there was a problem. */ int tep_filter_clear_trivial (struct tep_event_filter *filter, -enum filter_trivial_type type) +enum tep_filter_trivial_type type) {struct tep_filter_type *filter_type;int count =0 ;
@@ -1614,11 +1614,11 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,if (filter_type->filter->type !=TEP_FILTER_ARG_BOOLEAN )continue ;switch (type) { -case FILTER_TRIVIAL_FALSE : +case TEP_FILTER_TRIVIAL_FALSE :if (filter_type->filter->boolean.value)continue ;break ; -case FILTER_TRIVIAL_TRUE : +case TEP_FILTER_TRIVIAL_TRUE :if (!filter_type->filter->boolean.value)continue ;default :
@@ -1656,7 +1656,7 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,*/ int tep_filter_event_has_trivial (struct tep_event_filter *filter,int event_id, -enum filter_trivial_type type) +enum tep_filter_trivial_type type) {struct tep_filter_type *filter_type;
@@ -1672,10 +1672,10 @@ int tep_filter_event_has_trivial(struct tep_event_filter *filter,return 0 ;switch (type) { -case FILTER_TRIVIAL_FALSE : +case TEP_FILTER_TRIVIAL_FALSE :return !filter_type->filter->boolean.value; -case FILTER_TRIVIAL_TRUE : +case TEP_FILTER_TRIVIAL_TRUE :return filter_type->filter->boolean.value;default :return 1 ;
@@ -2409,8 +2409,8 @@ int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filterif (filter_type1->filter->type != filter_type2->filter->type)break ;switch (filter_type1->filter->type) { -case FILTER_TRIVIAL_FALSE : -case FILTER_TRIVIAL_TRUE : +case TEP_FILTER_TRIVIAL_FALSE : +case TEP_FILTER_TRIVIAL_TRUE :/* trivial types just need the type compared */ continue ;default :
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 21/27 perf script: Enhance sample flags for trace begin / end
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Allow for different combinations of sample flags with "trace begin" or "trace end".
Previously, the Intel PT decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. Before remedying that, prepare 'perf script' to display sample flags with more combinations that include trace begin / end. In those cases display 'tr start' and 'tr end' separately.
--- tools/perf/builtin-script.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-)
tools/perf/builtin-script.c +27 -9
@@ -1262,6 +1262,18 @@ static struct { {0, NULL} }; +static const char *sample_flags_to_name (u32 flags) +{ +int i; + +for (i =0 ; sample_flags[i].name ; i++) { +if (sample_flags[i].flags == flags) +return sample_flags[i].name; + } + +return NULL ; +} +static int perf_sample__fprintf_flags (u32 flags,FILE *fp) {const char *chars =PERF_IP_FLAG_CHARS ;
@@ -1271,11 +1283,20 @@ static int perf_sample__fprintf_flags(u32 flags, FILE *fp)char str[33 ];int i, pos =0 ; -for (i =0 ; sample_flags[i].name ; i++) { -if (sample_flags[i].flags == (flags & ~PERF_IP_FLAG_IN_TX )) { - name = sample_flags[i].name; -break ; - } + name =sample_flags_to_name (flags & ~PERF_IP_FLAG_IN_TX ); +if (name) +return fprintf (fp," %-15s%4s " , name, in_tx ?"(x)" :"" ); + +if (flags &PERF_IP_FLAG_TRACE_BEGIN ) { + name =sample_flags_to_name (flags & ~(PERF_IP_FLAG_IN_TX |PERF_IP_FLAG_TRACE_BEGIN )); +if (name) +return fprintf (fp," tr strt %-7s%4s " , name, in_tx ?"(x)" :"" ); + } + +if (flags &PERF_IP_FLAG_TRACE_END ) { + name =sample_flags_to_name (flags & ~(PERF_IP_FLAG_IN_TX |PERF_IP_FLAG_TRACE_END )); +if (name) +return fprintf (fp," tr end %-7s%4s " , name, in_tx ?"(x)" :"" ); }for (i =0 ; i < n; i++, flags >>=1 ) {
@@ -1288,10 +1309,7 @@ static int perf_sample__fprintf_flags(u32 flags, FILE *fp) } str[pos] =0 ; -if (name) -return fprintf (fp," %-7s%4s " , name, in_tx ?"(x)" :"" ); - -return fprintf (fp," %-11s " , str); +return fprintf (fp," %-19s " , str); }struct printer_data {
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 22/27 perf db-export: Add trace begin / end branch type variants
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add branch types to cover different combinations with "trace begin" or "trace end".
Previously, the Intel PT decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. Before remedying that, prepare the database export to export branch types with more combinations that include trace begin / end. In those cases extend the descriptions to include 'trace begin' and 'trace end' separately.
--- tools/perf/util/db-export.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/perf/util/db-export.c +22 -0
@@ -463,6 +463,28 @@ int db_export__branch_types(struct db_export *dbe)if (err)break ; } + +/* Add trace begin / end variants */ +for (i =0 ; branch_types[i].name ; i++) { +const char *name = branch_types[i].name; +u32 type = branch_types[i].branch_type; +char buf[64 ]; + +if (type ==PERF_IP_FLAG_BRANCH || + (type & (PERF_IP_FLAG_TRACE_BEGIN |PERF_IP_FLAG_TRACE_END ))) +continue ; + +snprintf (buf,sizeof (buf),"trace begin / %s" , name); + err =db_export__branch_type (dbe, type |PERF_IP_FLAG_TRACE_BEGIN , buf); +if (err) +break ; + +snprintf (buf,sizeof (buf),"%s / trace end" , name); + err =db_export__branch_type (dbe, type |PERF_IP_FLAG_TRACE_END , buf); +if (err) +break ; + } +return err; }
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 23/27 perf tools: Improve thread_stack__event() for trace begin / end
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
thread_stack__event() is used to create call stacks, by keeping track of calls and returns. Improve the handling of trace begin / end to allow for a trace that ends in a call.
Previously, the Intel PT decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. Before remedying that, enhance the thread stack so that it does not expect to see the 'return' for a 'call' that ends the trace.
Committer notes:
Added this:
return thread_stack__push(thread->ts, ret_addr,
- flags && PERF_IP_FLAG_TRACE_END);
+ flags & PERF_IP_FLAG_TRACE_END);
To fix problem spotted by:
debian:9: clang version 3.8.1-24 (tags/RELEASE_381/final)
debian:experimental: clang version 6.0.1-6 (tags/RELEASE_601/final)
--- tools/perf/util/thread-stack.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-)
tools/perf/util/thread-stack.c +30 -5
@@ -36,6 +36,7 @@* @branch_count: the branch count when the entry was created * @cp: call path * @no_call: a 'call' was not seen +* @trace_end: a 'call' but trace ended */ struct thread_stack_entry {u64 ret_addr;
@@ -44,6 +45,7 @@ struct thread_stack_entry {u64 branch_count;struct call_path *cp;bool no_call; +bool trace_end; };/**
@@ -112,7 +114,8 @@ static struct thread_stack *thread_stack__new(struct thread *thread,return ts; } -static int thread_stack__push (struct thread_stack *ts,u64 ret_addr) +static int thread_stack__push (struct thread_stack *ts,u64 ret_addr, +bool trace_end) {int err =0 ;
@@ -124,6 +127,7 @@ static int thread_stack__push(struct thread_stack *ts, u64 ret_addr) } } + ts->stack[ts->cnt].trace_end = trace_end; ts->stack[ts->cnt++].ret_addr = ret_addr;return err;
@@ -150,6 +154,18 @@ static void thread_stack__pop(struct thread_stack *ts, u64 ret_addr) } } +static void thread_stack__pop_trace_end (struct thread_stack *ts) +{ +size_t i; + +for (i = ts->cnt; i; ) { +if (ts->stack[--i].trace_end) + ts->cnt = i; +else +return ; + } +} +static bool thread_stack__in_kernel (struct thread_stack *ts) {if (!ts->cnt)
@@ -254,10 +270,19 @@ int thread_stack__event(struct thread *thread, u32 flags, u64 from_ip, ret_addr = from_ip + insn_len;if (ret_addr == to_ip)return 0 ;/* Zero-length calls are excluded */ -return thread_stack__push (thread->ts, ret_addr); - }else if (flags &PERF_IP_FLAG_RETURN ) { -if (!from_ip) -return 0 ; +return thread_stack__push (thread->ts, ret_addr, + flags &PERF_IP_FLAG_TRACE_END ); + }else if (flags &PERF_IP_FLAG_TRACE_BEGIN ) { +/* +* If the caller did not change the trace number (which would +* have flushed the stack) then try to make sense of the stack. +* Possibly, tracing began after returning to the current +* address, so try to pop that. Also, do not expect a call made +* when the trace ended, to return, so pop that. +*/ +thread_stack__pop (thread->ts, to_ip); +thread_stack__pop_trace_end (thread->ts); + }else if ((flags &PERF_IP_FLAG_RETURN ) && from_ip) {thread_stack__pop (thread->ts, to_ip); }
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 24/27 perf tools: Improve thread_stack__process() for trace begin / end
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
thread_stack__process() is used to create call paths for database export. Improve the handling of trace begin / end to allow for a trace that ends in a call.
Previously, the Intel PT decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. Before remedying that, enhance the thread stack so that it identifies the trace end by the flag instead of by ip == 0.
--- tools/perf/util/thread-stack.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
tools/perf/util/thread-stack.c +9 -7
@@ -357,7 +357,7 @@ void call_return_processor__free(struct call_return_processor *crp)static int thread_stack__push_cp (struct thread_stack *ts,u64 ret_addr,u64 timestamp,u64 ref,struct call_path *cp, -bool no_call) +bool no_call,bool trace_end) {struct thread_stack_entry *tse;int err;
@@ -375,6 +375,7 @@ static int thread_stack__push_cp(struct thread_stack *ts, u64 ret_addr, tse->branch_count = ts->branch_count; tse->cp = cp; tse->no_call = no_call; + tse->trace_end = trace_end;return 0 ; }
@@ -448,7 +449,7 @@ static int thread_stack__bottom(struct thread *thread, struct thread_stack *ts,return -ENOMEM ;return thread_stack__push_cp (thread->ts, ip, sample->time, ref, cp, - true); + true, false); } static int thread_stack__no_call_return(struct thread *thread,
@@ -480,7 +481,7 @@ static int thread_stack__no_call_return(struct thread *thread,if (!cp)return -ENOMEM ;return thread_stack__push_cp (ts,0 , sample->time, ref, - cp, true); + cp, true, false); } }else if (thread_stack__in_kernel (ts) && sample->ip < ks) {/* Return to userspace, so pop all kernel addresses */
@@ -505,7 +506,7 @@ static int thread_stack__no_call_return(struct thread *thread,return -ENOMEM ; err =thread_stack__push_cp (ts, sample->addr, sample->time, ref, cp, - true); + true, false);if (err)return err;
@@ -525,7 +526,7 @@ static int thread_stack__trace_begin(struct thread *thread,/* Pop trace end */ tse = &ts->stack[ts->cnt -1 ]; -if (tse->cp->sym ==NULL && tse->cp->ip ==0 ) { +if (tse->trace_end) { err =thread_stack__call_return (thread, ts, --ts->cnt, timestamp, ref, false);if (err)
@@ -554,7 +555,7 @@ static int thread_stack__trace_end(struct thread_stack *ts, ret_addr = sample->ip + sample->insn_len;return thread_stack__push_cp (ts, ret_addr, sample->time, ref, cp, - false); + false, true); } int thread_stack__process(struct thread *thread, struct comm *comm,
@@ -604,6 +605,7 @@ int thread_stack__process(struct thread *thread, struct comm *comm, ts->last_time = sample->time;if (sample->flags &PERF_IP_FLAG_CALL ) { +bool trace_end = sample->flags &PERF_IP_FLAG_TRACE_END ;struct call_path_root *cpr = ts->crp->cpr;struct call_path *cp;u64 ret_addr;
@@ -621,7 +623,7 @@ int thread_stack__process(struct thread *thread, struct comm *comm,if (!cp)return -ENOMEM ; err =thread_stack__push_cp (ts, ret_addr, sample->time, ref, - cp, false); + cp, false, trace_end); }else if (sample->flags &PERF_IP_FLAG_RETURN ) {if (!sample->ip || !sample->addr)return 0 ;
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 25/27 perf intel-pt: Add decoder flags for trace begin / end
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Previously, the decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. To prepare for remedying that, add Intel PT decoder flags for trace begin / end and map them to the existing sample flags.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 ++ tools/perf/util/intel-pt.c | 5 +++++ 2 files changed, 7 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.h +2 -0
@@ -37,6 +37,8 @@ enum intel_pt_sample_type {INTEL_PT_EX_STOP =1 <<6 ,INTEL_PT_PWR_EXIT =1 <<7 ,INTEL_PT_CBR_CHG =1 <<8 , +INTEL_PT_TRACE_BEGIN =1 <<9 , + INTEL_PT_TRACE_END = 1 << 10, }; enum intel_pt_period_type {
tools/perf/util/intel-pt.c +5 -0
@@ -908,6 +908,11 @@ static void intel_pt_sample_flags(struct intel_pt_queue *ptq) ptq->insn_len = ptq->state->insn_len;memcpy (ptq->insn, ptq->state->insn,INTEL_PT_INSN_BUF_SZ ); } + +if (ptq->state->type &INTEL_PT_TRACE_BEGIN ) + ptq->flags |=PERF_IP_FLAG_TRACE_BEGIN ; +if (ptq->state->type &INTEL_PT_TRACE_END ) + ptq->flags |=PERF_IP_FLAG_TRACE_END ; } static int intel_pt_setup_queue(struct intel_pt *pt,
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 26/27 perf intel-pt: Implement decoder flags for trace begin / end
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Have the Intel PT decoder implement the new Intel PT decoder flags for trace begin / end.
Previously, the decoder would indicate begin / end by a branch from / to zero. That hides useful information, in particular when a trace ends with a call. That happens when using address filters, for example:
$ perf record -e intel_pt/cyc,mtc_period=0,noretcomp/u --filter='filter main @ /bin/uname ' uname Linux [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.031 MB perf.data ]
Before:
$ perf script --itrace=cre -Ftime,flags,ip,sym,symoff,addr --ns 7249.622183310: tr strt 0 [unknown] => 401590 main+0x0 7249.622183311: call 4015b9 main+0x29 => 0 [unknown] 7249.622183711: tr strt 0 [unknown] => 4015be main+0x2e 7249.622183714: call 4015c8 main+0x38 => 0 [unknown] 7249.622247731: tr strt 0 [unknown] => 4015cd main+0x3d 7249.622247760: call 4015d7 main+0x47 => 0 [unknown] 7249.622248340: tr strt 0 [unknown] => 4015dc main+0x4c 7249.622248341: call 4015e1 main+0x51 => 0 [unknown] 7249.622248681: tr strt 0 [unknown] => 4015e6 main+0x56 7249.622248682: call 4015eb main+0x5b => 0 [unknown] 7249.622248970: tr strt 0 [unknown] => 4015f0 main+0x60 7249.622248971: call 401612 main+0x82 => 0 [unknown] 7249.622249757: tr strt 0 [unknown] => 401617 main+0x87 7249.622249770: call 401847 main+0x2b7 => 0 [unknown] 7249.622250606: tr strt 0 [unknown] => 40184c main+0x2bc 7249.622250612: call 4019bf main+0x42f => 0 [unknown] 7249.622256823: tr strt 0 [unknown] => 4019c4 main+0x434 7249.622256863: call 4019f5 main+0x465 => 0 [unknown] 7249.622264217: tr strt 0 [unknown] => 4019fa main+0x46a 7249.622264235: call 401832 main+0x2a2 => 0 [unknown]
After:
$ perf script --itrace=cre -Ftime,flags,ip,sym,symoff,addr --ns 7249.622183310: tr strt 0 [unknown] => 401590 main+0x0 7249.622183311: tr end call 4015b9 main+0x29 => 401ef0 set_program_name+0x0 7249.622183711: tr strt 0 [unknown] => 4015be main+0x2e 7249.622183714: tr end call 4015c8 main+0x38 => 4014b0 setlocale@plt+0x0 7249.622247731: tr strt 0 [unknown] => 4015cd main+0x3d 7249.622247760: tr end call 4015d7 main+0x47 => 4012d0 bindtextdomain@plt+0x0 7249.622248340: tr strt 0 [unknown] => 4015dc main+0x4c 7249.622248341: tr end call 4015e1 main+0x51 => 4012b0 textdomain@plt+0x0 7249.622248681: tr strt 0 [unknown] => 4015e6 main+0x56 7249.622248682: tr end call 4015eb main+0x5b => 404340 atexit+0x0 7249.622248970: tr strt 0 [unknown] => 4015f0 main+0x60 7249.622248971: tr end call 401612 main+0x82 => 401320 getopt_long@plt+0x0 7249.622249757: tr strt 0 [unknown] => 401617 main+0x87 7249.622249770: tr end call 401847 main+0x2b7 => 401360 uname@plt+0x0 7249.622250606: tr strt 0 [unknown] => 40184c main+0x2bc 7249.622250612: tr end call 4019bf main+0x42f => 401b10 print_element+0x0 7249.622256823: tr strt 0 [unknown] => 4019c4 main+0x434 7249.622256863: tr end call 4019f5 main+0x465 => 401340 __overflow@plt+0x0 7249.622264217: tr strt 0 [unknown] => 4019fa main+0x46a 7249.622264235: tr end call 401832 main+0x2a2 => 401520 exit@plt+0x0
--- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 34 +++++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +23 -11
@@ -1165,7 +1165,7 @@ static int intel_pt_walk_tip(struct intel_pt_decoder *decoder) decoder->pge = false; decoder->continuous_period = false; decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; - decoder->state.to_ip =0 ; + decoder->state.type |=INTEL_PT_TRACE_END ;return 0 ; }if (err ==INTEL_PT_RETURN )
@@ -1179,9 +1179,13 @@ static int intel_pt_walk_tip(struct intel_pt_decoder *decoder) decoder->continuous_period = false; decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; decoder->state.from_ip = decoder->ip; - decoder->state.to_ip =0 ; -if (decoder->packet.count !=0 ) +if (decoder->packet.count ==0 ) { + decoder->state.to_ip =0 ; + }else { + decoder->state.to_ip = decoder->last_ip; decoder->ip = decoder->last_ip; + } + decoder->state.type |=INTEL_PT_TRACE_END ; }else { decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; decoder->state.from_ip = decoder->ip;
@@ -1208,7 +1212,8 @@ static int intel_pt_walk_tip(struct intel_pt_decoder *decoder) decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; decoder->ip = to_ip; decoder->state.from_ip = decoder->ip; - decoder->state.to_ip =0 ; + decoder->state.to_ip = to_ip; + decoder->state.type |=INTEL_PT_TRACE_END ;return 0 ; } intel_pt_log_at("ERROR: Conditional branch when expecting indirect branch",
@@ -1640,14 +1645,15 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)case INTEL_PT_TIP_PGD : decoder->state.from_ip = decoder->ip; - decoder->state.to_ip =0 ; -if (decoder->packet.count !=0 ) { +if (decoder->packet.count ==0 ) { + decoder->state.to_ip =0 ; + }else {intel_pt_set_ip (decoder); -intel_pt_log ("Omitting PGD ip " x64_fmt"\n" , - decoder->ip); + decoder->state.to_ip = decoder->ip; } decoder->pge = false; decoder->continuous_period = false; + decoder->state.type |=INTEL_PT_TRACE_END ;return 0 ;case INTEL_PT_TIP_PGE :
@@ -1661,6 +1667,7 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)intel_pt_set_ip (decoder); decoder->state.to_ip = decoder->ip; } + decoder->state.type |=INTEL_PT_TRACE_BEGIN ;return 0 ;case INTEL_PT_TIP :
@@ -1739,6 +1746,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)intel_pt_set_ip (decoder); decoder->state.from_ip =0 ; decoder->state.to_ip = decoder->ip; + decoder->state.type |=INTEL_PT_TRACE_BEGIN ;return 0 ; }
@@ -2077,9 +2085,13 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder) decoder->pge = decoder->packet.type !=INTEL_PT_TIP_PGD ;if (intel_pt_have_ip (decoder))intel_pt_set_ip (decoder); -if (decoder->ip) -return 0 ; -break ; +if (!decoder->ip) +break ; +if (decoder->packet.type ==INTEL_PT_TIP_PGE ) + decoder->state.type |=INTEL_PT_TRACE_BEGIN ; +if (decoder->packet.type ==INTEL_PT_TIP_PGD ) + decoder->state.type |=INTEL_PT_TRACE_END ; +return 0 ;case INTEL_PT_FUP :if (intel_pt_have_ip (decoder))
Signature · 1 line
2.14.4
Arnaldo Carvalho de Melo
maintainerPATCH 27/27 perf vendor events arm64: Revise core JSON events for eMAG
In reply to Arnaldo Carvalho de MeloFrom: Sean V Kelley <[email protected]>
Split the PMU events into meaningful functional groups. Update core pmu events based on supported ARMv8 recommended IMPLEMENTATION DEFINED events.
The JSON files are updated with reference to a PMU table shared here:
Changes in v3:
- Removed CHAIN event as it wouldn't be useful in Perf - William
- Will factor out events 0x00-0x38 in a follow-on patch - William
- to armv8-recommended.json
Changes in V2:
- Provided documentation for changes - John, William
- Broke up into meaningful groups - William
LPU-Reference: 20180916221203.7935-1-seanvk.dev at oregontracks.org
--- .../pmu-events/arch/arm64/ampere/emag/branch.json | 23 +++ .../pmu-events/arch/arm64/ampere/emag/bus.json | 26 +++ .../pmu-events/arch/arm64/ampere/emag/cache.json | 191 +++++++++++++++++++++ .../pmu-events/arch/arm64/ampere/emag/clock.json | 20 +++ .../arch/arm64/ampere/emag/core-imp-def.json | 32 ---- .../arch/arm64/ampere/emag/exception.json | 50 ++++++ .../arch/arm64/ampere/emag/instruction.json | 89 ++++++++++ .../arch/arm64/ampere/emag/intrinsic.json | 14 ++ .../pmu-events/arch/arm64/ampere/emag/memory.json | 29 ++++ .../arch/arm64/ampere/emag/pipeline.json | 50 ++++++ 10 files changed, 492 insertions(+), 32 deletions(-) create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/branch.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/bus.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/cache.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/clock.json delete mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/core-imp-def.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/exception.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/instruction.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/memory.json create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json
tools/perf/pmu-events/arch/arm64/ampere/emag/branch.json new file +23 -0
@@ -0,0 +1,23 @@ +[ + { + "ArchStdEvent": "BR_IMMED_SPEC", + }, + { + "ArchStdEvent": "BR_RETURN_SPEC", + }, + { + "ArchStdEvent": "BR_INDIRECT_SPEC", + }, + { + "PublicDescription": "Mispredicted or not predicted branch speculatively executed", + "EventCode": "0x10", + "EventName": "BR_MIS_PRED", + "BriefDescription": "Branch mispredicted" + }, + { + "PublicDescription": "Predictable branch speculatively executed", + "EventCode": "0x12", + "EventName": "BR_PRED", + "BriefDescription": "Predictable branch" + }, +]
tools/perf/pmu-events/arch/arm64/ampere/emag/bus.json new file +26 -0
@@ -0,0 +1,26 @@ +[ + { + "ArchStdEvent": "BUS_ACCESS_RD", + }, + { + "ArchStdEvent": "BUS_ACCESS_WR", + }, + { + "ArchStdEvent": "BUS_ACCESS_SHARED", + }, + { + "ArchStdEvent": "BUS_ACCESS_NOT_SHARED", + }, + { + "ArchStdEvent": "BUS_ACCESS_NORMAL", + }, + { + "ArchStdEvent": "BUS_ACCESS_PERIPH", + }, + { + "PublicDescription": "Bus access", + "EventCode": "0x19", + "EventName": "BUS_ACCESS", + "BriefDescription": "Bus access" + }, +]
tools/perf/pmu-events/arch/arm64/ampere/emag/cache.json new file +191 -0
191 lines not on this page · raw message
tools/perf/pmu-events/arch/arm64/ampere/emag/clock.json new file +20 -0
@@ -0,0 +1,20 @@ +[ + { + "PublicDescription": "The number of core clock cycles", + "EventCode": "0x11", + "EventName": "CPU_CYCLES", + "BriefDescription": "Clock cycles" + }, + { + "PublicDescription": "FSU clocking gated off cycle", + "EventCode": "0x101", + "EventName": "FSU_CLOCK_OFF_CYCLES", + "BriefDescription": "FSU clocking gated off cycle" + }, + { + "PublicDescription": "Wait state cycle", + "EventCode": "0x110", + "EventName": "Wait_CYCLES", + "BriefDescription": "Wait state cycle" + }, +]
tools/perf/pmu-events/arch/arm64/ampere/emag/core-imp-def.json deleted +0 -32
@@ -1,32 +0,0 @@ -[ - { - "ArchStdEvent": "L1D_CACHE_RD", - }, - { - "ArchStdEvent": "L1D_CACHE_WR", - }, - { - "ArchStdEvent": "L1D_CACHE_REFILL_RD", - }, - { - "ArchStdEvent": "L1D_CACHE_REFILL_WR", - }, - { - "ArchStdEvent": "L1D_TLB_REFILL_RD", - }, - { - "ArchStdEvent": "L1D_TLB_REFILL_WR", - }, - { - "ArchStdEvent": "L1D_TLB_RD", - }, - { - "ArchStdEvent": "L1D_TLB_WR", - }, - { - "ArchStdEvent": "BUS_ACCESS_RD", - }, - { - "ArchStdEvent": "BUS_ACCESS_WR", - } -]
tools/perf/pmu-events/arch/arm64/ampere/emag/exception.json new file +50 -0
50 lines not on this page · raw message
tools/perf/pmu-events/arch/arm64/ampere/emag/instruction.json new file +89 -0
89 lines not on this page · raw message
tools/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json new file +14 -0
@@ -0,0 +1,14 @@ +[ + { + "ArchStdEvent": "LDREX_SPEC", + }, + { + "ArchStdEvent": "STREX_PASS_SPEC", + }, + { + "ArchStdEvent": "STREX_FAIL_SPEC", + }, + { + "ArchStdEvent": "STREX_SPEC", + }, +]
tools/perf/pmu-events/arch/arm64/ampere/emag/memory.json new file +29 -0
@@ -0,0 +1,29 @@ +[ + { + "ArchStdEvent": "MEM_ACCESS_RD", + }, + { + "ArchStdEvent": "MEM_ACCESS_WR", + }, + { + "ArchStdEvent": "UNALIGNED_LD_SPEC", + }, + { + "ArchStdEvent": "UNALIGNED_ST_SPEC", + }, + { + "ArchStdEvent": "UNALIGNED_LDST_SPEC", + }, + { + "PublicDescription": "Data memory access", + "EventCode": "0x13", + "EventName": "MEM_ACCESS", + "BriefDescription": "Memory access" + }, + { + "PublicDescription": "Local memory error. This event counts any correctable or uncorrectable memory error (ECC or parity) in the protected core RAMs", + "EventCode": "0x1a", + "EventName": "MEM_ERROR", + "BriefDescription": "Memory error" + }, +]
tools/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
2.14.4