Propagate trace format all the way to the consumer

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

diff --git a/src/common/kernel-consumer/kernel-consumer.cpp b/src/common/kernel-consumer/kernel-consumer.cpp
index 9bc66a47880d82247644ba8e1b6c4ba7c707253d..4bb2681af603856fc3bfd39dc84e3763116846c4 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.cpp
+++ b/src/common/kernel-consumer/kernel-consumer.cpp
@@ -514,17 +514,12 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                DBG("consumer_add_channel %" PRIu64, msg.u.channel.channel_key);
                new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
                                msg.u.channel.session_id,
-                               msg.u.channel.chunk_id.is_set ?
-                                               &chunk_id : NULL,
-                               msg.u.channel.pathname,
-                               msg.u.channel.name,
-                               msg.u.channel.relayd_id, msg.u.channel.output,
-                               msg.u.channel.tracefile_size,
-                               msg.u.channel.tracefile_count, 0,
-                               msg.u.channel.monitor,
-                               msg.u.channel.live_timer_interval,
-                               msg.u.channel.is_live,
-                               NULL, NULL);
+                               msg.u.channel.chunk_id.is_set ? &chunk_id : NULL,
+                               msg.u.channel.pathname, msg.u.channel.name, msg.u.channel.relayd_id,
+                               msg.u.channel.output, msg.u.channel.tracefile_size,
+                               msg.u.channel.tracefile_count, 0, msg.u.channel.monitor,
+                               msg.u.channel.live_timer_interval, msg.u.channel.is_live, NULL,
+                               NULL, msg.u.channel.trace_format);
                if (new_channel == NULL) {
                        lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
                        goto end_nosignal;
@@ -672,18 +667,10 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                health_code_update();
 
                pthread_mutex_lock(&channel->lock);
-               new_stream = consumer_stream_create(
-                               channel,
-                               channel->key,
-                               fd,
-                               channel->name,
-                               channel->relayd_id,
-                               channel->session_id,
-                               channel->trace_chunk,
-                               msg.u.stream.cpu,
-                               &alloc_ret,
-                               channel->type,
-                               channel->monitor);
+               new_stream = consumer_stream_create(channel, channel->key, fd, channel->name,
+                               channel->relayd_id, channel->session_id, channel->trace_chunk,
+                               msg.u.stream.cpu, &alloc_ret, channel->type, channel->monitor,
+                               channel->trace_format);
                if (new_stream == NULL) {
                        switch (alloc_ret) {
                        case -ENOMEM: