X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=33cbbed3e679a42df9db3951b0a2040b681b481c;hp=474b9a30091a13cf9309c683ade5f076b3bd493c;hb=c30aaa51f34105a7f20b9ceb39866001843db6e6;hpb=a7d9a3e70b39416bc1ef11dc46010452d19b8db4 diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c index 474b9a300..33cbbed3e 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) { @@ -233,7 +235,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 +278,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; }