X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=37c0a9325960f84940ae268039b3c4e8bea212ce;hp=a4f9763ebf6c33b90bbe2cc0059490f0715eb418;hb=d2678a0d274cb95b653a3f119979c98ecd35acc6;hpb=f472090a05156d5e404506c386ace12cf5636c7d

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a4f9763eb..37c0a9325 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -304,7 +304,7 @@ struct lttng_ht *agent_apps_ht_by_sock = NULL;
  * NR_LTTNG_SESSIOND_READY must match the number of calls to
  * sessiond_notify_ready().
  */
-#define NR_LTTNG_SESSIOND_READY		5
+#define NR_LTTNG_SESSIOND_READY		6
 int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY;
 
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events)
@@ -860,7 +860,7 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 			cds_lfht_for_each_entry(ksess->consumer->socks->ht,
 					&iter.iter, socket, node.node) {
 				pthread_mutex_lock(socket->lock);
-				ret = kernel_consumer_send_channel_stream(socket,
+				ret = kernel_consumer_send_channel_streams(socket,
 						channel, ksess,
 						session->output_traces ? 1 : 0);
 				pthread_mutex_unlock(socket->lock);
@@ -4496,12 +4496,41 @@ static void *thread_manage_clients(void *data)
 	}
 
 	sessiond_notify_ready();
+
 	ret = sem_post(&load_info->message_thread_ready);
 	if (ret) {
 		PERROR("sem_post message_thread_ready");
 		goto error;
 	}
 
+	/*
+	 * Wait until all support threads are initialized before accepting
+	 * commands.
+	 */
+	while (uatomic_read(&lttng_sessiond_ready) != 0) {
+		fd_set read_fds;
+		struct timeval timeout;
+
+		FD_ZERO(&read_fds);
+		FD_SET(thread_quit_pipe[0], &read_fds);
+		memset(&timeout, 0, sizeof(timeout));
+		timeout.tv_usec = 1000;
+
+		/*
+		 * If a support thread failed to launch, it may signal that
+		 * we must exit and the sessiond would never be marked as
+		 * "ready".
+		 *
+		 * The timeout is set to 1ms, which serves as a way to
+		 * pace down this check.
+		 */
+		ret = select(thread_quit_pipe[0] + 1, &read_fds, NULL, NULL,
+				&timeout);
+		if (ret > 0 || (ret < 0 && errno != EINTR)) {
+			goto exit;
+		}
+	}
+
 	/* This testpoint is after we signal readiness to the parent. */
 	if (testpoint(sessiond_thread_manage_clients)) {
 		goto error;
@@ -5033,8 +5062,8 @@ static int set_option(int opt, const char *arg, const char *optname)
 				ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
 				return -1;
 			}
-			config.agent_tcp_port = (uint32_t) v;
-			DBG3("Agent TCP port set to non default: %u", config.agent_tcp_port);
+			config.agent_tcp_port.begin = config.agent_tcp_port.end = (int) v;
+			DBG3("Agent TCP port set to non default: %i", (int) v);
 		}
 	} else if (string_match(optname, "load") || opt == 'l') {
 		if (!arg || *arg == '\0') {
@@ -5626,15 +5655,6 @@ static int write_pidfile(void)
         return utils_create_pid_file(getpid(), config.pid_file_path.value);
 }
 
-/*
- * Write agent TCP port using the rundir.
- */
-static int write_agent_port(void)
-{
-	return utils_create_pid_file(config.agent_tcp_port,
-			config.agent_port_file_path.value);
-}
-
 static int set_clock_plugin_env(void)
 {
 	int ret = 0;
@@ -5717,9 +5737,9 @@ int main(int argc, char **argv)
 	struct lttng_pipe *ust32_channel_monitor_pipe = NULL,
 			*ust64_channel_monitor_pipe = NULL,
 			*kernel_channel_monitor_pipe = NULL;
-	bool notification_thread_running = false;
-	bool rotation_thread_running = false;
-	bool timer_thread_running = false;
+	bool notification_thread_launched = false;
+	bool rotation_thread_launched = false;
+	bool timer_thread_launched = false;
 	struct lttng_pipe *ust32_channel_rotate_pipe = NULL,
 			*ust64_channel_rotate_pipe = NULL,
 			*kernel_channel_rotate_pipe = NULL;
@@ -6096,12 +6116,6 @@ int main(int argc, char **argv)
 		retval = -1;
 		goto exit_init_data;
 	}
-	ret = write_agent_port();
-	if (ret) {
-		ERR("Error in write_agent_port");
-		retval = -1;
-		goto exit_init_data;
-	}
 
 	/* Initialize communication library */
 	lttcomm_init();
@@ -6154,7 +6168,7 @@ int main(int argc, char **argv)
 		stop_threads();
 		goto exit_notification;
 	}
-	notification_thread_running = true;
+	notification_thread_launched = true;
 
 	/* Create timer thread. */
 	ret = pthread_create(&timer_thread, default_pthread_attr(),
@@ -6166,7 +6180,7 @@ int main(int argc, char **argv)
 		stop_threads();
 		goto exit_notification;
 	}
-	timer_thread_running = true;
+	timer_thread_launched = true;
 
 	/* rotation_thread_data acquires the pipes' read side. */
 	rotation_thread_handle = rotation_thread_handle_create(
@@ -6194,7 +6208,7 @@ int main(int argc, char **argv)
 		stop_threads();
 		goto exit_rotation;
 	}
-	rotation_thread_running = true;
+	rotation_thread_launched = true;
 
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&client_thread, default_pthread_attr(),
@@ -6400,7 +6414,7 @@ exit_init_data:
 	 * of the active session and channels at the moment of the teardown.
 	 */
 	if (notification_thread_handle) {
-		if (notification_thread_running) {
+		if (notification_thread_launched) {
 			notification_thread_command_quit(
 					notification_thread_handle);
 			ret = pthread_join(notification_thread, &status);
@@ -6414,7 +6428,7 @@ exit_init_data:
 	}
 
 	if (rotation_thread_handle) {
-		if (rotation_thread_running) {
+		if (rotation_thread_launched) {
 			ret = pthread_join(rotation_thread, &status);
 			if (ret) {
 				errno = ret;
@@ -6425,7 +6439,7 @@ exit_init_data:
 		rotation_thread_handle_destroy(rotation_thread_handle);
 	}
 
-	if (timer_thread_running) {
+	if (timer_thread_launched) {
 		kill(getpid(), LTTNG_SESSIOND_SIG_EXIT);
 		ret = pthread_join(timer_thread, &status);
 		if (ret) {