diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 04:17:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 04:22:46 -0400 |
| commit | 387ef4e24af4ae43a7961ba6eec749488da99535 (patch) | |
| tree | bdd6995a544bce7401562afbd70ffd27e2b5a083 /tools/lib/traceevent/event-parse.h | |
| parent | 6a67943a18c264d5f3df436da38edb3e59adc905 (diff) | |
| parent | 81e9b994bb20716d1f6c47e048e4ae4a43de2f83 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
perf/core improvements and fixes:
- Preparatory patches to use hw events in PMU syntax, from Jiri Olsa
- Remaining backport of trace-cmd's libparseevent, from Namhyung Kim
- Fix libtraceevent 'clean' make target, from Namhyung Kim
- Teach ctags about libtraceevent error codes, from Namhyung Kim
- Fix libtraceevent dependency files usage, from Namhyung Kim
- Support hex number pretty printing in libtraceevent, fixing
kvm output, from Namhyung Kim
- Kill some die() usage in libtraceevent, from Namhyung Kim
- Improve support for hw breakpoints parsing/pretty printing/testing,
from Jiri Olsa
- Clarify perf bench option naming, from Hitoshi Mitake
- Look for ".note" ELF notes too, used in the kernel vdso, from Jiri Olsa
- Fix internal PMU list usage, removing leak, from Robert Richter
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/traceevent/event-parse.h')
| -rw-r--r-- | tools/lib/traceevent/event-parse.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index ac997bc7b59..5772ad8cb38 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h | |||
| @@ -226,6 +226,11 @@ struct print_arg_symbol { | |||
| 226 | struct print_flag_sym *symbols; | 226 | struct print_flag_sym *symbols; |
| 227 | }; | 227 | }; |
| 228 | 228 | ||
| 229 | struct print_arg_hex { | ||
| 230 | struct print_arg *field; | ||
| 231 | struct print_arg *size; | ||
| 232 | }; | ||
| 233 | |||
| 229 | struct print_arg_dynarray { | 234 | struct print_arg_dynarray { |
| 230 | struct format_field *field; | 235 | struct format_field *field; |
| 231 | struct print_arg *index; | 236 | struct print_arg *index; |
| @@ -253,6 +258,7 @@ enum print_arg_type { | |||
| 253 | PRINT_FIELD, | 258 | PRINT_FIELD, |
| 254 | PRINT_FLAGS, | 259 | PRINT_FLAGS, |
| 255 | PRINT_SYMBOL, | 260 | PRINT_SYMBOL, |
| 261 | PRINT_HEX, | ||
| 256 | PRINT_TYPE, | 262 | PRINT_TYPE, |
| 257 | PRINT_STRING, | 263 | PRINT_STRING, |
| 258 | PRINT_BSTRING, | 264 | PRINT_BSTRING, |
| @@ -270,6 +276,7 @@ struct print_arg { | |||
| 270 | struct print_arg_typecast typecast; | 276 | struct print_arg_typecast typecast; |
| 271 | struct print_arg_flags flags; | 277 | struct print_arg_flags flags; |
| 272 | struct print_arg_symbol symbol; | 278 | struct print_arg_symbol symbol; |
| 279 | struct print_arg_hex hex; | ||
| 273 | struct print_arg_func func; | 280 | struct print_arg_func func; |
| 274 | struct print_arg_string string; | 281 | struct print_arg_string string; |
| 275 | struct print_arg_op op; | 282 | struct print_arg_op op; |
