X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=c86d52803b80ac19c254eb3a1e267f3223d6c5d9;hp=474b9a30091a13cf9309c683ade5f076b3bd493c;hb=ca22feea083301934d1c8511851c86fb008c0697;hpb=a7d9a3e70b39416bc1ef11dc46010452d19b8db4

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 474b9a300..c86d52803 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -48,7 +48,8 @@ int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
 			channel->fd,
 			channel->channel->attr.subbuf_size,
 			0, /* Kernel */
-			channel->channel->name);
+			channel->channel->name,
+			channel->stream_count);
 
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
@@ -116,7 +117,8 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			session->metadata->fd,
 			session->metadata->conf->attr.subbuf_size,
 			0, /* for kernel */
-			"metadata");
+			"metadata",
+			1);
 
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
@@ -136,7 +138,8 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			consumer->net_seq_index,
 			1, /* Metadata flag set */
 			"metadata",
-			pathname);
+			pathname,
+			session->id);
 
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm,
@@ -205,7 +208,8 @@ int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
 			consumer->net_seq_index,
 			0, /* Metadata flag unset */
 			stream->name,
-			pathname);
+			pathname,
+			session->id);
 
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
@@ -233,7 +237,7 @@ int kernel_consumer_send_channel_stream(int sock,
 
 	/* Bail out if consumer is disabled */
 	if (!session->consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		goto error;
 	}
 
@@ -276,7 +280,7 @@ int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session)
 
 	/* Bail out if consumer is disabled */
 	if (!session->consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		goto error;
 	}