X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=8806e9c322bef43b818975bee8f44bc520e3aa53;hp=befc5d6dcf95c2dd441412e132a5f2c58158acf4;hb=a4baae1b0463bc4ce65c2a458c4a941e7fabc594;hpb=ecc48a904cc7c419fd1400afaa9ccb93be490cdd

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index befc5d6dc..8806e9c32 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -28,9 +28,10 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/uri.h>
+#include <common/relayd/relayd.h>
 
 #include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
 #include "ust-app.h"
 #include "utils.h"
 
@@ -141,7 +142,7 @@ int consumer_recv_status_reply(struct consumer_socket *sock)
 		goto end;
 	}
 
-	if (reply.ret_code == LTTNG_OK) {
+	if (reply.ret_code == LTTCOMM_CONSUMERD_SUCCESS) {
 		/* All good. */
 		ret = 0;
 	} else {
@@ -177,13 +178,14 @@ int consumer_recv_status_channel(struct consumer_socket *sock,
 	}
 
 	/* An error is possible so don't touch the key and stream_count. */
-	if (reply.ret_code != LTTNG_OK) {
+	if (reply.ret_code != LTTCOMM_CONSUMERD_SUCCESS) {
 		ret = -1;
 		goto end;
 	}
 
 	*key = reply.key;
 	*stream_count = reply.stream_count;
+	ret = 0;
 
 end:
 	return ret;
@@ -904,6 +906,19 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.stream.cpu = cpu;
 }
 
+void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
+		enum lttng_consumer_command cmd,
+		uint64_t channel_key, uint64_t net_seq_idx)
+{
+	assert(msg);
+
+	memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
+
+	msg->cmd_type = cmd;
+	msg->u.sent_streams.channel_key = channel_key;
+	msg->u.sent_streams.net_seq_idx = net_seq_idx;
+}
+
 /*
  * Send stream communication structure to the consumer.
  */
@@ -939,7 +954,8 @@ error:
  */
 int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
-		enum lttng_stream_type type, uint64_t session_id)
+		enum lttng_stream_type type, uint64_t session_id,
+		char *session_name, char *hostname, int session_live_timer)
 {
 	int ret;
 	struct lttcomm_consumer_msg msg;
@@ -955,6 +971,18 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		goto error;
 	}
 
+	if (type == LTTNG_STREAM_CONTROL) {
+		ret = relayd_create_session(rsock,
+				&msg.u.relayd_sock.relayd_session_id,
+				session_name, hostname, session_live_timer,
+				consumer->snapshot);
+		if (ret < 0) {
+			/* Close the control socket. */
+			(void) relayd_close(rsock);
+			goto error;
+		}
+	}
+
 	msg.cmd_type = LTTNG_CONSUMER_ADD_RELAYD_SOCKET;
 	/*
 	 * Assign network consumer output index using the temporary consumer since