X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=4153612746f90c84780b208b94ce2ce731126217;hb=8f0044bfed9f5ca51eab51478f483f92cc8f84a7;hp=1405554d97cc04e2a466c74a8930d2deb27de0de;hpb=4ce514c43483ba24fd935024da5b7aca681a7e52;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 1405554d9..415361274 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -26,7 +26,7 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
 #include "kernel-consumer.h"
 
 static char *create_channel_path(struct consumer_output *consumer,
@@ -123,7 +123,8 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 			CONSUMER_CHANNEL_TYPE_DATA,
 			channel->channel->attr.tracefile_size,
 			channel->channel->attr.tracefile_count,
-			monitor);
+			monitor,
+			channel->channel->attr.live_timer_interval);
 
 	health_code_update();
 
@@ -184,7 +185,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			DEFAULT_KERNEL_CHANNEL_OUTPUT,
 			CONSUMER_CHANNEL_TYPE_METADATA,
 			0, 0,
-			monitor);
+			monitor, 0);
 
 	health_code_update();
 
@@ -261,6 +262,40 @@ error:
 	return ret;
 }
 
+/*
+ * Sending the notification that all streams were sent with STREAMS_SENT.
+ */
+int kernel_consumer_streams_sent(struct consumer_socket *sock,
+		struct ltt_kernel_session *session, uint64_t channel_key)
+{
+	int ret;
+	struct lttcomm_consumer_msg lkm;
+	struct consumer_output *consumer;
+
+	assert(sock);
+	assert(session);
+
+	DBG("Sending streams_sent");
+	/* Get consumer output pointer */
+	consumer = session->consumer;
+
+	/* Prep stream consumer message */
+	consumer_init_streams_sent_comm_msg(&lkm,
+			LTTNG_CONSUMER_STREAMS_SENT,
+			channel_key, consumer->net_seq_index);
+
+	health_code_update();
+
+	/* Send stream and file descriptor */
+	ret = consumer_send_msg(sock, &lkm);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	return ret;
+}
+
 /*
  * Send all stream fds of kernel channel to the consumer.
  */
@@ -353,6 +388,16 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 		if (ret < 0) {
 			goto error;
 		}
+		if (monitor) {
+			/*
+			 * Inform the relay that all the streams for the
+			 * channel were sent.
+			 */
+			ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+			if (ret < 0) {
+				goto error;
+			}
+		}
 	}
 
 	DBG("Kernel consumer FDs of metadata and channel streams sent");
@@ -371,7 +416,6 @@ int kernel_consumer_destroy_channel(struct consumer_socket *socket,
 
 	assert(channel);
 	assert(socket);
-	assert(socket->fd);
 
 	DBG("Sending kernel consumer destroy channel key %d", channel->fd);
 
@@ -400,7 +444,6 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
 
 	assert(metadata);
 	assert(socket);
-	assert(socket->fd);
 
 	DBG("Sending kernel consumer destroy channel key %d", metadata->fd);