X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a96dc51952eb6ef84f127c027499795cfefcda76;hb=143745a6d56824ceb630548e96f95ea54361c5ff;hp=d6bc015981d96246f3ef71dd98c0dea9bc3403b3;hpb=4de276989fa969565218121e95485796091f7cd4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index d6bc01598..a96dc5195 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -69,7 +69,7 @@
 #include "fd-limit.h"
 #include "health-sessiond.h"
 #include "testpoint.h"
-#include "ust-thread.h"
+#include "notify-apps.h"
 #include "agent-thread.h"
 #include "save.h"
 #include "notification-thread.h"
@@ -1354,6 +1354,7 @@ int main(int argc, char **argv)
 	struct rotation_thread_timer_queue *rotation_timer_queue = NULL;
 	struct lttng_thread *client_thread = NULL;
 	struct lttng_thread *notification_thread = NULL;
+	struct lttng_thread *register_apps_thread = NULL;
 
 	init_kernel_workarounds();
 
@@ -1747,7 +1748,9 @@ int main(int argc, char **argv)
 	}
 
 	/* Create thread to manage application registration. */
-	if (!launch_application_registration_thread(&ust_cmd_queue)) {
+	register_apps_thread = launch_application_registration_thread(
+			&ust_cmd_queue);
+	if (!register_apps_thread) {
 		retval = -1;
 		goto exit_reg_apps;
 	}
@@ -1815,6 +1818,10 @@ exit_kernel:
 exit_agent_reg:
 exit_apps_notify:
 exit_apps:
+	if (register_apps_thread) {
+		lttng_thread_shutdown(register_apps_thread);
+		lttng_thread_put(register_apps_thread);
+	}
 exit_reg_apps:
 exit_dispatch:
 exit_client: