X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=d4dae16fd43656db074bb064b2c48720710ebc7c;hp=c5c7d84b1f5d7bb0d434fff7f187665ca9041cc7;hb=b4d096a6292e78c601dba161dbb15f48ad89935f;hpb=df5b86c84d896eb2d74a8757c234492c1d1fc3be

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c5c7d84b1..d4dae16fd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1216,6 +1216,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();
@@ -1514,6 +1517,9 @@ error_poll:
 	health_unregister(health_sessiond);
 	DBG("consumer thread cleanup completed");
 
+	rcu_thread_offline();
+	rcu_unregister_thread();
+
 	return NULL;
 }
 
@@ -1781,6 +1787,12 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 				wait_queue->count--;
 				ust_app_destroy(wait_node->app);
 				free(wait_node);
+				/*
+				 * Silence warning of use-after-free in
+				 * cds_list_for_each_entry_safe which uses
+				 * __typeof__(*wait_node).
+				 */
+				wait_node = NULL;
 				break;
 			}
 		}
@@ -1983,7 +1995,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
@@ -2025,6 +2037,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) {
@@ -5967,6 +5995,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;
@@ -6032,6 +6064,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 {