Propagate trace format all the way to the consumer

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

diff --git a/src/bin/lttng-sessiond/consumer.hpp b/src/bin/lttng-sessiond/consumer.hpp
index 15e2a2fc7c109cc59e0fcc460e3dea085a5dd5a1..33b0353272443738d92d19981ad2707b36819323 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.hpp
+++ b/src/bin/lttng-sessiond/consumer.hpp
@@ -8,11 +8,12 @@
 #ifndef _CONSUMER_H
 #define _CONSUMER_H
 
+#include <algorithm>
 #include <common/consumer/consumer.hpp>
 #include <common/hashtable/hashtable.hpp>
 #include <lttng/lttng.h>
+#include <lttng/trace-format-descriptor-internal.hpp>
 #include <urcu/ref.h>
-#include <algorithm>
 
 #include "snapshot.hpp"
 
@@ -261,7 +262,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                const char *name,
                uint64_t relayd_id,
                uint64_t key,
-               unsigned char *uuid,
+               const lttng_uuid& uuid,
                uint32_t chan_id,
                uint64_t tracefile_size,
                uint64_t tracefile_count,
@@ -272,7 +273,8 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                const char *root_shm_path,
                const char *shm_path,
                struct lttng_trace_chunk *trace_chunk,
-               const struct lttng_credentials *buffer_credentials);
+               const struct lttng_credentials *buffer_credentials,
+               const lttng::trace_format_descriptor& trace_format);
 void consumer_init_add_stream_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t channel_key,
                uint64_t stream_key,
@@ -295,7 +297,8 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                unsigned int live_timer_interval,
                bool is_in_live_session,
                unsigned int monitor_timer_interval,
-               struct lttng_trace_chunk *trace_chunk);
+               struct lttng_trace_chunk *trace_chunk,
+               const lttng::trace_format_descriptor& trace_format);
 int consumer_is_data_pending(uint64_t session_id,
                struct consumer_output *consumer);
 int consumer_close_metadata(struct consumer_socket *socket,
@@ -321,7 +324,7 @@ enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
 int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
                struct consumer_output *output, bool is_metadata_channel);
 int consumer_init(struct consumer_socket *socket,
-               const lttng_uuid sessiond_uuid);
+               const lttng_uuid& sessiond_uuid);
 
 int consumer_create_trace_chunk(struct consumer_socket *socket,
                uint64_t relayd_id, uint64_t session_id,