diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:47:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:47:14 +0200 |
| commit | 196676497f2507966f99abef63bede6a8550f8b3 (patch) | |
| tree | be58cfeca954483721fa4864db952fc0b032fb63 /tools/perf/util/thread.c | |
| parent | 1b647a166f07dcf08709c8606470f4b17a4aa11d (diff) | |
| parent | 09f4d78ab0af0973e1a49c10eb7bf977c68cc3aa (diff) | |
| download | linux-196676497f2507966f99abef63bede6a8550f8b3.tar.gz linux-196676497f2507966f99abef63bede6a8550f8b3.tar.bz2 linux-196676497f2507966f99abef63bede6a8550f8b3.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Fix buildid processing done at the end of a 'perf record' session, a
problem that happened in workloads involving lots of small short-lived
processes. That code was not asking the perf_session layer to order
the events.
Make the code more robust to handle some of the problems with such
out-of-order events and fix 'perf record' to ask for ordered events
on systems where we have perf_event_attr.sample_id_all. (Adrian Hunter)
- Show backtrace when handling a SIGSEGV in 'perf top --stdio' (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/thread.c')
| -rw-r--r-- | tools/perf/util/thread.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 28c4b746baa1..0a9ae8014729 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -191,6 +191,12 @@ static int thread__clone_map_groups(struct thread *thread, if (thread->pid_ == parent->pid_) return 0; + if (thread->mg == parent->mg) { + pr_debug("broken map groups on thread %d/%d parent %d/%d\n", + thread->pid_, thread->tid, parent->pid_, parent->tid); + return 0; + } + /* But this one is new process, copy maps. */ for (i = 0; i < MAP__NR_TYPES; ++i) if (map_groups__clone(thread->mg, parent->mg, i) < 0) |