Propagate trace format to ust_app_session object

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

diff --git a/src/bin/lttng-sessiond/ust-consumer.cpp b/src/bin/lttng-sessiond/ust-consumer.cpp
index df4689920eb0b90ffff3eb45c368b42be8727c28..2724121d7915ac85fc795d337d8395d495a451a1 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.cpp
+++ b/src/bin/lttng-sessiond/ust-consumer.cpp
@@ -134,33 +134,18 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                break;
        }
 
-       consumer_init_ask_channel_comm_msg(&msg,
-                       ua_chan->attr.subbuf_size,
-                       ua_chan->attr.num_subbuf,
-                       ua_chan->attr.overwrite,
-                       ua_chan->attr.switch_timer_interval,
-                       ua_chan->attr.read_timer_interval,
-                       ua_sess->live_timer_interval,
-                       ua_sess->live_timer_interval != 0,
-                       ua_chan->monitor_timer_interval,
-                       output,
-                       (int) ua_chan->attr.type,
-                       ua_sess->tracing_id,
-                       &pathname[consumer_path_offset],
-                       ua_chan->name,
-                       consumer->net_seq_index,
-                       ua_chan->key,
-                       registry->uuid,
-                       chan_id,
-                       ua_chan->tracefile_size,
-                       ua_chan->tracefile_count,
-                       ua_sess->id,
+       consumer_init_ask_channel_comm_msg(&msg, ua_chan->attr.subbuf_size,
+                       ua_chan->attr.num_subbuf, ua_chan->attr.overwrite,
+                       ua_chan->attr.switch_timer_interval, ua_chan->attr.read_timer_interval,
+                       ua_sess->live_timer_interval, ua_sess->live_timer_interval != 0,
+                       ua_chan->monitor_timer_interval, output, (int) ua_chan->attr.type,
+                       ua_sess->tracing_id, &pathname[consumer_path_offset], ua_chan->name,
+                       consumer->net_seq_index, ua_chan->key, registry->uuid, chan_id,
+                       ua_chan->tracefile_size, ua_chan->tracefile_count, ua_sess->id,
                        ua_sess->output_traces,
                        lttng_credentials_get_uid(&ua_sess->real_credentials),
-                       ua_chan->attr.blocking_timeout,
-                       root_shm_path, shm_path,
-                       trace_chunk,
-                       &ua_sess->effective_credentials);
+                       ua_chan->attr.blocking_timeout, root_shm_path, shm_path, trace_chunk,
+                       &ua_sess->effective_credentials, *ua_sess->trace_format);
 
        health_code_update();