X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fthread.c;h=ae7f45fd97f8257b645d37513e80c3274410d938;hp=ff6c0962f33768390500e7e5da2cedee55311a5f;hb=d7b377ed1acd4043bde353d99122e0e56fa4e975;hpb=0f68efb616cd046543e5fc5a091466ec26df2216

diff --git a/src/bin/lttng-sessiond/thread.c b/src/bin/lttng-sessiond/thread.c
index ff6c0962f..ae7f45fd9 100644
--- a/src/bin/lttng-sessiond/thread.c
+++ b/src/bin/lttng-sessiond/thread.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "thread.h"
@@ -71,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;
 }
 
@@ -174,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;
 }