diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-13 12:36:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-13 12:36:03 +0300 |
| commit | c36608843adf4674c462e49f63b64b2987d0ba0b (patch) | |
| tree | 065cfa3b53e86cd17ba2b4b13fc0179e58bd9fe4 /tools/perf/util/event.c | |
| parent | 0bd106d26dbe444160104b3153ca1652d2ab913b (diff) | |
| parent | 34b7b0f95d41d2351a080e774d71085171db90e6 (diff) | |
| download | linux-c36608843adf4674c462e49f63b64b2987d0ba0b.tar.xz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
New, user visible features:
- Add --buildid-all option to 'perf record' to avoid processing
samples, just collecting build-ids for _all_ the DSOs that appears
in PERF_RECORD_MMAP records (Namhyung Kim)
- Add some more usage tips to appear in the hists browser
(top & report) (Namhyung Kim, Andi Kleen)
- Fix mmap2 event allocation in synthesize code, where we were
allocating space just for PERF_RECORD_MMAP, the older variant,
which could lead to corner case problems (Wang Nan)
Infrastructure fixes:
- Make list.h self-sufficient, removing one more reference to
kernel headers that lead to recent breakage when some rculist
change was made in the kernel sources. (Josh Poimboeuf)
Add missing NORETURN define for parse-options.h in
tools/lib/subcmd (Josh Poimboeuf)
- Fallback to srcdir/Documentation/ when not finding tips.txt
elsewhere (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index cd61bb1f3917..85155e91b61b 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -503,7 +503,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool, if (comm_event == NULL) goto out; - mmap_event = malloc(sizeof(mmap_event->mmap) + machine->id_hdr_size); + mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size); if (mmap_event == NULL) goto out_free_comm; @@ -577,7 +577,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool, if (comm_event == NULL) goto out; - mmap_event = malloc(sizeof(mmap_event->mmap) + machine->id_hdr_size); + mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size); if (mmap_event == NULL) goto out_free_comm; |