Propagate trace format all the way to the consumer

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

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 30d1f102142781289be72a965a9b8bfe719486ff..25da16ff0ec85252e4ab0285007aeee50730f8a9 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -97,18 +97,9 @@ static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
        LTTNG_ASSERT(channel);
        LTTNG_ASSERT(ctx);
 
-       stream = consumer_stream_create(
-                       channel,
-                       channel->key,
-                       key,
-                       channel->name,
-                       channel->relayd_id,
-                       channel->session_id,
-                       channel->trace_chunk,
-                       cpu,
-                       &alloc_ret,
-                       channel->type,
-                       channel->monitor);
+       stream = consumer_stream_create(channel, channel->key, key, channel->name,
+                       channel->relayd_id, channel->session_id, channel->trace_chunk, cpu,
+                       &alloc_ret, channel->type, channel->monitor, channel->trace_format);
        if (stream == NULL) {
                switch (alloc_ret) {
                case -ENOENT:
@@ -1482,23 +1473,17 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                };
 
                /* Create a plain object and reserve a channel key. */
-               channel = consumer_allocate_channel(
-                               msg.u.ask_channel.key,
+               channel = consumer_allocate_channel(msg.u.ask_channel.key,
                                msg.u.ask_channel.session_id,
-                               msg.u.ask_channel.chunk_id.is_set ?
-                                               &chunk_id : NULL,
-                               msg.u.ask_channel.pathname,
-                               msg.u.ask_channel.name,
+                               msg.u.ask_channel.chunk_id.is_set ? &chunk_id : NULL,
+                               msg.u.ask_channel.pathname, msg.u.ask_channel.name,
                                msg.u.ask_channel.relayd_id,
                                (enum lttng_event_output) msg.u.ask_channel.output,
-                               msg.u.ask_channel.tracefile_size,
-                               msg.u.ask_channel.tracefile_count,
-                               msg.u.ask_channel.session_id_per_pid,
-                               msg.u.ask_channel.monitor,
-                               msg.u.ask_channel.live_timer_interval,
-                               msg.u.ask_channel.is_live,
-                               msg.u.ask_channel.root_shm_path,
-                               msg.u.ask_channel.shm_path);
+                               msg.u.ask_channel.tracefile_size, msg.u.ask_channel.tracefile_count,
+                               msg.u.ask_channel.session_id_per_pid, msg.u.ask_channel.monitor,
+                               msg.u.ask_channel.live_timer_interval, msg.u.ask_channel.is_live,
+                               msg.u.ask_channel.root_shm_path, msg.u.ask_channel.shm_path,
+                               msg.u.ask_channel.trace_format);
                if (!channel) {
                        goto end_channel_error;
                }