X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=2ace82b966f9bb692e80591a38d28f6b22f28798;hb=9c9107228280bcffde8eb79cf8bb34c8208e04a4;hp=87345bd6ab2a115954456a38784ec19a6b99f8b3;hpb=833984dec970c82384d0f41bab4df5bd5d730f3e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 87345bd6a..2ace82b96 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1212,6 +1212,9 @@ static void *thread_manage_consumer(void *data)
 
 	DBG("[thread] Manage consumer started");
 
+	rcu_register_thread();
+	rcu_thread_online();
+
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CONSUMER);
 
 	health_code_update();
@@ -1510,6 +1513,9 @@ error_poll:
 	health_unregister(health_sessiond);
 	DBG("consumer thread cleanup completed");
 
+	rcu_thread_offline();
+	rcu_unregister_thread();
+
 	return NULL;
 }
 
@@ -2021,6 +2027,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) {
@@ -2153,6 +2175,10 @@ static void *thread_registration_apps(void *data)
 					ust_cmd = zmalloc(sizeof(struct ust_command));
 					if (ust_cmd == NULL) {
 						PERROR("ust command zmalloc");
+						ret = close(sock);
+						if (ret) {
+							PERROR("close");
+						}
 						goto error;
 					}
 
@@ -2709,7 +2735,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		 * domain.
 		 */
 		if (session->kernel_session->consumer) {
-			consumer_destroy_output(session->kernel_session->consumer);
+			consumer_output_put(session->kernel_session->consumer);
 		}
 		session->kernel_session->consumer =
 			consumer_copy_output(session->consumer);
@@ -2723,7 +2749,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 	case LTTNG_DOMAIN_UST:
 		DBG3("Copying tracing session consumer output in UST session");
 		if (session->ust_session->consumer) {
-			consumer_destroy_output(session->ust_session->consumer);
+			consumer_output_put(session->ust_session->consumer);
 		}
 		session->ust_session->consumer =
 			consumer_copy_output(session->consumer);
@@ -2843,7 +2869,7 @@ static int create_kernel_session(struct ltt_session *session)
 				session->kernel_session->consumer->dst.trace_path,
 				S_IRWXU | S_IRWXG, session->uid, session->gid);
 		if (ret < 0) {
-			if (ret != -EEXIST) {
+			if (errno != EEXIST) {
 				ERR("Trace directory creation error");
 				goto error;
 			}
@@ -5933,6 +5959,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;
@@ -5998,6 +6028,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 {