Messages in this thread Patch in this message | | | Date | Thu, 17 Jul 2014 21:27:08 -0700 | From | tip-bot for Adrian Hunter <> | Subject | [tip:perf/core] perf thread: Allow deletion of a thread with no map groups |
| |
Commit-ID: 9608b84e4dd95341b88cad646b114811f5bccbba Gitweb: http://git.kernel.org/tip/9608b84e4dd95341b88cad646b114811f5bccbba Author: Adrian Hunter <adrian.hunter@intel.com> AuthorDate: Wed, 16 Jul 2014 10:19:43 +0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 17 Jul 2014 10:32:35 -0300
perf thread: Allow deletion of a thread with no map groups
It needs to be possible to call thread__delete() on a thread with no map groups.
This is needed for a subsequent patch which deletes a thread on the error path before map groups have been attached.
Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1405495184-20441-2-git-send-email-adrian.hunter@intel.com Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 7a32f44..b9c36ef 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -60,8 +60,10 @@ void thread__delete(struct thread *thread) { struct comm *comm, *tmp; - map_groups__put(thread->mg); - thread->mg = NULL; + if (thread->mg) { + map_groups__put(thread->mg); + thread->mg = NULL; + } list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) { list_del(&comm->list); comm__free(comm);
| |