From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 24 Aug 2015 18:41:42 +0000 (-0400)
Subject: Fix: app cmd leak on sessiond exit
X-Git-Tag: v2.8.0-rc1~422
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=772b8f4db503f0dc5ba184b2f71509eb4c718b24;p=lttng-tools.git

Fix: app cmd leak on sessiond exit

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5a7d153e5..6310db7e6 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -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;