diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-29 08:36:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-29 08:36:50 -0700 |
| commit | f9ec2e6f7991e748e75e324ed05ca2a7ec360ebb (patch) | |
| tree | ea90749ef55c64270634f843bed411b0e51833d3 /tools/perf/tests/open-syscall-tp-fields.c | |
| parent | 2a999aa0a10f4d0d9a57a06974df620f8a856239 (diff) | |
| parent | cd65718712469ad844467250e8fad20a5838baae (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tooling fixes from Ingo Molnar:
"This contains five tooling fixes:
- fix a remaining mmap2 assumption which resulted in perf top output
breakage
- fix mmap ring-buffer processing bug that corrupts data
- fix for a severe python scripting memory leak
- fix broken (and user-visible) -g option handling
- fix stdio output
The diffstat size is larger than what we'd like to see this late :-/"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Fixup mmap event consumption
perf top: Split -G and --call-graph
perf record: Split -g and --call-graph
perf hists: Add color overhead for stdio output buffer
perf tools: Fix up /proc/PID/maps parsing
perf script python: Fix mem leak due to missing Py_DECREFs on dict entries
Diffstat (limited to 'tools/perf/tests/open-syscall-tp-fields.c')
| -rw-r--r-- | tools/perf/tests/open-syscall-tp-fields.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c index fc5b9fca8b4..524b221b829 100644 --- a/tools/perf/tests/open-syscall-tp-fields.c +++ b/tools/perf/tests/open-syscall-tp-fields.c @@ -77,8 +77,10 @@ int test__syscall_open_tp_fields(void) ++nr_events; - if (type != PERF_RECORD_SAMPLE) + if (type != PERF_RECORD_SAMPLE) { + perf_evlist__mmap_consume(evlist, i); continue; + } err = perf_evsel__parse_sample(evsel, event, &sample); if (err) { |