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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 0620c7e70..37c0a9325 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -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;
@@ -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();