X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=a0818452f4f540ef880a3effb13c0e2b89fc0e10;hb=28fcbaeb0c451fbc4e2c289de2ce1f29522239eb;hp=84be2db463fb0b8cd8a3a6107fd321531eef2aa9;hpb=e2039c7a8a76decaf4403d13f2ec420fe33ef2be;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 84be2db46..a0818452f 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -480,13 +480,24 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.channel.name, msg.u.channel.uid, msg.u.channel.gid,
 				msg.u.channel.relayd_id, msg.u.channel.output,
 				msg.u.channel.tracefile_size,
-				msg.u.channel.tracefile_count,
+				msg.u.channel.tracefile_count, 0,
 				msg.u.channel.monitor);
 		if (new_channel == NULL) {
 			lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
 			goto end_nosignal;
 		}
 		new_channel->nb_init_stream_left = msg.u.channel.nb_init_streams;
+		switch (msg.u.channel.output) {
+		case LTTNG_EVENT_SPLICE:
+			new_channel->output = CONSUMER_CHANNEL_SPLICE;
+			break;
+		case LTTNG_EVENT_MMAP:
+			new_channel->output = CONSUMER_CHANNEL_MMAP;
+			break;
+		default:
+			ERR("Channel output unknown %d", msg.u.channel.output);
+			goto end_nosignal;
+		}
 
 		/* Translate and save channel type. */
 		switch (msg.u.channel.type) {
@@ -653,9 +664,9 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		/* Do not monitor this stream. */
 		if (!channel->monitor) {
-			DBG("Kernel consumer add stream %s in no monitor mode with"
+			DBG("Kernel consumer add stream %s in no monitor mode with "
 					"relayd id %" PRIu64, new_stream->name,
-					new_stream->relayd_stream_id);
+					new_stream->net_seq_idx);
 			cds_list_add(&new_stream->no_monitor_node,
 					&channel->stream_no_monitor_list.head);
 			break;