Propagate trace format all the way to the consumer

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

diff --git a/src/bin/lttng-sessiond/kernel-consumer.cpp b/src/bin/lttng-sessiond/kernel-consumer.cpp
index b51b56c3e772e2e1a213853266f10b79f30591ab..72d9460498611827931e98f6cd30d097b12cd9d2 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.cpp
+++ b/src/bin/lttng-sessiond/kernel-consumer.cpp
@@ -141,22 +141,15 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
        }
 
        /* Prep channel message structure */
-       consumer_init_add_channel_comm_msg(&lkm,
-                       channel->key,
-                       ksession->id,
-                       &pathname[consumer_path_offset],
-                       consumer->net_seq_index,
-                       channel->channel->name,
-                       channel->stream_count,
-                       channel->channel->attr.output,
-                       CONSUMER_CHANNEL_TYPE_DATA,
+       consumer_init_add_channel_comm_msg(&lkm, channel->key, ksession->id,
+                       &pathname[consumer_path_offset], consumer->net_seq_index,
+                       channel->channel->name, channel->stream_count,
+                       channel->channel->attr.output, CONSUMER_CHANNEL_TYPE_DATA,
                        channel->channel->attr.tracefile_size,
-                       channel->channel->attr.tracefile_count,
-                       monitor,
-                       channel->channel->attr.live_timer_interval,
-                       ksession->is_live_session,
+                       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);
+                       ksession->current_trace_chunk, *ksession->trace_format);
 
        health_code_update();
 
@@ -217,22 +210,14 @@ 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,
-                       "",
-                       consumer->net_seq_index,
-                       ksession->metadata->conf->name,
-                       1,
-                       ksession->metadata->conf->attr.output,
-                       CONSUMER_CHANNEL_TYPE_METADATA,
+       consumer_init_add_channel_comm_msg(&lkm, ksession->metadata->key, ksession->id, "",
+                       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.tracefile_count, monitor,
                        ksession->metadata->conf->attr.live_timer_interval,
-                       ksession->is_live_session,
-                       0,
-                       ksession->current_trace_chunk);
+                       ksession->is_live_session, 0, ksession->current_trace_chunk,
+                       *ksession->trace_format);
 
        health_code_update();