X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fthread.c;h=ae7f45fd97f8257b645d37513e80c3274410d938;hp=ed090f6d6b09d65570c4fced29f951d871e1c1a3;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=25357057de5ae4dd2a572e8f9b893c1b90cbd60a

diff --git a/src/bin/lttng-sessiond/thread.c b/src/bin/lttng-sessiond/thread.c
index ed090f6d6..ae7f45fd9 100644
--- a/src/bin/lttng-sessiond/thread.c
+++ b/src/bin/lttng-sessiond/thread.c
@@ -61,9 +61,10 @@ void *launch_thread(void *data)
 	void *ret;
 	struct lttng_thread *thread = (struct lttng_thread *) data;
 
-	DBG("Launching \"%s\" thread", thread->name);
+	logger_set_thread_name(thread->name, true);
+	DBG("Entering thread entry point");
 	ret = thread->entry(thread->data);
-	DBG("Thread \"%s\" has returned", thread->name);
+	DBG("Thread entry point has returned");
 	return ret;
 }
 
@@ -164,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;
 }