sessiond: enforce mmap output type for kernel metadata channel

[lttng-tools.git] / src / bin / lttng-sessiond / kernel-consumer.c

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 0fff2c1a1e05ec63d584ff28ed59b06f43067241..6244963cc688746b575719ee09fad3e217db5025 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -156,6 +156,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
                        channel->channel->attr.tracefile_count,
                        monitor,
                        channel->channel->attr.live_timer_interval,
+                       ksession->is_live_session,
                        channel_attr_extended->monitor_timer_interval,
                        ksession->current_trace_chunk);
 
@@ -228,12 +229,17 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
                        ksession->uid,
                        ksession->gid,
                        consumer->net_seq_index,
-                       DEFAULT_METADATA_NAME,
+                       ksession->metadata->conf->name,
                        1,
-                       DEFAULT_KERNEL_CHANNEL_OUTPUT,
+                       ksession->metadata->conf->attr.output,
                        CONSUMER_CHANNEL_TYPE_METADATA,
-                       0, 0,
-                       monitor, 0, 0, ksession->current_trace_chunk);
+                       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();