X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=11a34af2a4e13a293d096b39d60251963f9d2705;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=9622d3058941e6cbe79ffac6528356b14b0a00ad;hpb=a2814ea7573bf5edd5323d6f89c48ff14105db69;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 9622d3058..11a34af2a 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -175,11 +175,11 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	assert(session_trylock_list());
 
 	status = notification_thread_command_add_channel(
-			notification_thread_handle, session->name,
-			ksession->uid, ksession->gid,
-			channel->channel->name, channel->key,
-			LTTNG_DOMAIN_KERNEL,
-			channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
+			the_notification_thread_handle, session->name,
+			ksession->uid, ksession->gid, channel->channel->name,
+			channel->key, LTTNG_DOMAIN_KERNEL,
+			channel->channel->attr.subbuf_size *
+					channel->channel->attr.num_subbuf);
 	rcu_read_unlock();
 	if (status != LTTNG_OK) {
 		ret = -1;
@@ -222,12 +222,23 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	consumer = ksession->consumer;
 
 	/* Prep channel message structure */
-	consumer_init_add_channel_comm_msg(&lkm, ksession->metadata->key,
-			ksession->id, "", ksession->uid, ksession->gid,
-			consumer->net_seq_index, DEFAULT_METADATA_NAME, 1,
-			DEFAULT_KERNEL_CHANNEL_OUTPUT,
-			CONSUMER_CHANNEL_TYPE_METADATA, 0, 0, monitor, 0,
-			ksession->is_live_session, 0,
+	consumer_init_add_channel_comm_msg(&lkm,
+			ksession->metadata->key,
+			ksession->id,
+			"",
+			ksession->uid,
+			ksession->gid,
+			consumer->net_seq_index,
+			ksession->metadata->conf->name,
+			1,
+			ksession->metadata->conf->attr.output,
+			CONSUMER_CHANNEL_TYPE_METADATA,
+			ksession->metadata->conf->attr.tracefile_size,
+			ksession->metadata->conf->attr.tracefile_count,
+			monitor,
+			ksession->metadata->conf->attr.live_timer_interval,
+			ksession->is_live_session,
+			0,
 			ksession->current_trace_chunk);
 
 	health_code_update();