X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fthread.c;h=ae7f45fd97f8257b645d37513e80c3274410d938;hp=26661a36f2aae08c0b21426b9fa343ac9f820a61;hb=f2b3ef9f7d7adf6cc0678cd5933b638f5a9e75a6;hpb=86eff0042bf0b9e6277b281c4f3a680d997790d2

diff --git a/src/bin/lttng-sessiond/thread.c b/src/bin/lttng-sessiond/thread.c
index 26661a36f..ae7f45fd9 100644
--- a/src/bin/lttng-sessiond/thread.c
+++ b/src/bin/lttng-sessiond/thread.c
@@ -165,20 +165,22 @@ bool _lttng_thread_shutdown(struct lttng_thread *thread)
 		result = false;
 		goto end;
 	}
-	/* Release the list's reference to the thread. */
-	cds_list_del(&thread->node);
-	lttng_thread_put(thread);
+	DBG("Joined thread \"%s\"", thread->name);
 end:
 	return result;
 }
 
 bool lttng_thread_shutdown(struct lttng_thread *thread)
 {
-	bool result;
-
-	pthread_mutex_lock(&thread_list.lock);
-	result = _lttng_thread_shutdown(thread);
-	pthread_mutex_unlock(&thread_list.lock);
+	const bool result = _lttng_thread_shutdown(thread);
+
+	if (result) {
+		/* Release the list's reference to the thread. */
+		pthread_mutex_lock(&thread_list.lock);
+		cds_list_del(&thread->node);
+		lttng_thread_put(thread);
+		pthread_mutex_unlock(&thread_list.lock);
+	}
 	return result;
 }