X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=f698fae4c634be7b3445d9dc0e6d29253352f549;hb=2d54bfb67f451a491c8cdfb6f6caea3981dc21a8;hp=ac7f7c910317d45158ac75991fa55cea17af7610;hpb=3e3665b89947ebdd812bcfaca1090d22b34d5778;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index ac7f7c910..f698fae4c 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -327,17 +327,18 @@ static void sessiond_cleanup(void)
 
 	pthread_mutex_destroy(&session_list->lock);
 
-	wait_consumer(&kconsumer_data);
-	wait_consumer(&ustconsumer64_data);
-	wait_consumer(&ustconsumer32_data);
-
 	DBG("Cleaning up all agent apps");
 	agent_app_ht_clean();
-
 	DBG("Closing all UST sockets");
 	ust_app_clean_list();
 	buffer_reg_destroy_registries();
 
+	close_consumer_sockets();
+
+	wait_consumer(&kconsumer_data);
+	wait_consumer(&ustconsumer64_data);
+	wait_consumer(&ustconsumer32_data);
+
 	if (is_root && !config.no_kernel) {
 		DBG2("Closing kernel fd");
 		if (kernel_tracer_fd >= 0) {
@@ -351,8 +352,6 @@ static void sessiond_cleanup(void)
 		free(syscall_table);
 	}
 
-	close_consumer_sockets();
-
 	/*
 	 * We do NOT rmdir rundir because there are other processes
 	 * using it, for instance lttng-relayd, which can start in
@@ -1842,7 +1841,7 @@ int main(int argc, char **argv)
 	 */
 
 	/* Initiate teardown once activity occurs on the quit pipe. */
-	sessiond_wait_for_quit_pipe(-1U);
+	sessiond_wait_for_quit_pipe(-1);
 
 stop_threads:
 	/*