X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b5cfe307df0f09e1a1eec61de85795bee1de29ea;hb=fb45065e7ccafc636e6eec7ab2a463c49e603ebb;hp=5a7d153e568743c73365549bd9676311789b9c48;hpb=34c1e15a80239977ba300668f5736620938fea36;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5a7d153e5..b5cfe307d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1989,7 +1989,7 @@ static void *thread_dispatch_ust_registration(void *data)
 				 * Don't care about return value. Let the manage apps threads
 				 * handle app unregistration upon socket close.
 				 */
-				(void) ust_app_register_done(app->sock);
+				(void) ust_app_register_done(app);
 
 				/*
 				 * Even if the application socket has been closed, send the app
@@ -2031,6 +2031,22 @@ error:
 		free(wait_node);
 	}
 
+	/* Empty command queue. */
+	for (;;) {
+		/* Dequeue command for registration */
+		node = cds_wfcq_dequeue_blocking(&ust_cmd_queue.head, &ust_cmd_queue.tail);
+		if (node == NULL) {
+			break;
+		}
+		ust_cmd = caa_container_of(node, struct ust_command, node);
+		ret = close(ust_cmd->sock);
+		if (ret < 0) {
+			PERROR("close ust sock exit dispatch %d", ust_cmd->sock);
+		}
+		lttng_fd_put(LTTNG_FD_APPS, 1);
+		free(ust_cmd);
+	}
+
 error_testpoint:
 	DBG("Dispatch thread dying");
 	if (err) {
@@ -5973,6 +5989,10 @@ exit_apps:
 	}
 exit_reg_apps:
 
+	/*
+	 * Join dispatch thread after joining reg_apps_thread to ensure
+	 * we don't leak applications in the queue.
+	 */
 	ret = pthread_join(dispatch_thread, &status);
 	if (ret) {
 		errno = ret;
@@ -6038,6 +6058,9 @@ exit_options:
 	sessiond_cleanup_options();
 
 exit_set_signal_handler:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	if (!retval) {
 		exit(EXIT_SUCCESS);
 	} else {