diff options
| author | Arnaldo Carvalho de Melo | 2010-06-17 13:37:44 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2010-06-17 13:37:44 +0200 |
| commit | 720a3aeb7373cb49cf222d5f12e121f78d3d4410 (patch) | |
| tree | e2451f06fe4983c4aae971bdaf31fe538a7fec1a /tools/perf/util/event.c | |
| parent | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | kernel-qcow2-linux-720a3aeb7373cb49cf222d5f12e121f78d3d4410.tar.gz kernel-qcow2-linux-720a3aeb7373cb49cf222d5f12e121f78d3d4410.tar.xz kernel-qcow2-linux-720a3aeb7373cb49cf222d5f12e121f78d3d4410.zip | |
perf session: Remove threads from tree on PERF_RECORD_EXIT
Move them to a session->dead_threads list just like we do with maps that
are replaced, because we may have hist_entries pointing to them.
This fixes a bug when inserting maps for a new thread that reused the
TID, mixing maps for two different threads, causing an endless loop.
The code for insering maps should be made more robust but for .35 this
is the minimalistic patch.
Reported-by: Ingo Molnar <mingo@elte.hu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 1f08f008d289..2fbf6a463c81 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -538,8 +538,10 @@ int event__process_task(event_t *self, struct perf_session *session) dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid, self->fork.ppid, self->fork.ptid); - if (self->header.type == PERF_RECORD_EXIT) + if (self->header.type == PERF_RECORD_EXIT) { + perf_session__remove_thread(session, thread); return 0; + } if (thread == NULL || parent == NULL || thread__fork(thread, parent) < 0) { |