diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-11 09:40:25 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-11 09:40:25 +0100 |
commit | ced30bc9129777d715057d06fc8dbdfd3b81e94d (patch) | |
tree | ab682f7130a4ad1ce0d4fcb0f77f91db391bf34a /tools/lib | |
parent | perf bench mem: Prepare the x86-64 build for upstream memcpy_mcsafe() changes (diff) | |
parent | perf stat: Add --metric-only support for -A (diff) | |
download | linux-ced30bc9129777d715057d06fc8dbdfd3b81e94d.tar.xz linux-ced30bc9129777d715057d06fc8dbdfd3b81e94d.zip |
Merge tag 'perf-core-for-mingo-20160310' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Implement 'perf stat --metric-only' (Andi Kleen)
- Fix perf script python database export crash (Chris Phlipot)
Infrastructure changes:
- perf top/report --hierarchy assorted fixes for problems introduced in this
perf/core cycle (Namhyung Kim)
- Support '~' operation in libtraceevent (Steven Rosted)
Build fixes:
- Fix bulding of jitdump on opensuse on ubuntu systems when the DWARF
devel files are not installed (Arnaldo Carvalho de Melo)
- Do not try building jitdump on unsupported arches (Jiri Olsa)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/traceevent/event-parse.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 865dea55454b..190cc886ab91 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -2398,6 +2398,12 @@ static int arg_num_eval(struct print_arg *arg, long long *val) break; *val = left + right; break; + case '~': + ret = arg_num_eval(arg->op.right, &right); + if (!ret) + break; + *val = ~right; + break; default: do_warning("unknown op '%s'", arg->op.op); ret = 0; |