perf machine: Fix __machine__findnew_thread() error path
When thread__init_map_groups() fails, a new thread should be removed from the rbtree since it's gonna be freed. Also update last match cache only if the function succeeded. Reported-by: David Ahern <dsahern@gmail.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1420763892-15535-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
c6e5e9fbc3
Коммит
260d819e3a
|
@ -389,7 +389,6 @@ static struct thread *__machine__findnew_thread(struct machine *machine,
|
|||
if (th != NULL) {
|
||||
rb_link_node(&th->rb_node, parent, p);
|
||||
rb_insert_color(&th->rb_node, &machine->threads);
|
||||
machine->last_match = th;
|
||||
|
||||
/*
|
||||
* We have to initialize map_groups separately
|
||||
|
@ -400,9 +399,12 @@ static struct thread *__machine__findnew_thread(struct machine *machine,
|
|||
* leader and that would screwed the rb tree.
|
||||
*/
|
||||
if (thread__init_map_groups(th, machine)) {
|
||||
rb_erase(&th->rb_node, &machine->threads);
|
||||
thread__delete(th);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
machine->last_match = th;
|
||||
}
|
||||
|
||||
return th;
|
||||
|
|
Загрузка…
Ссылка в новой задаче