Propagate trace format to relayd on session creation

[deliverable/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 33b0353272443738d92d19981ad2707b36819323..66f3bc28101be1320cc643aaf1ca88a6564deca8 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.hpp
+++ b/src/bin/lttng-sessiond/consumer.hpp
@@ -226,19 +226,16 @@ int consumer_send_msg(struct consumer_socket *sock,
 int consumer_send_stream(struct consumer_socket *sock,
                struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
                const int *fds, size_t nb_fd);
-int consumer_send_channel(struct consumer_socket *sock,
-               struct lttcomm_consumer_msg *msg);
+int consumer_send_channel(struct consumer_socket *sock, struct lttcomm_consumer_msg *msg);
 int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
-               struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
-               enum lttng_stream_type type, uint64_t session_id,
-               const char *session_name, const char *hostname,
-               const char *base_path, int session_live_timer,
-               const uint64_t *current_chunk_id, time_t session_creation_time,
-               bool session_name_contains_creation_time);
-int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
-               int pipe);
-int consumer_send_destroy_relayd(struct consumer_socket *sock,
-               struct consumer_output *consumer);
+               struct lttcomm_relayd_sock *rsock,
+               struct consumer_output *consumer,
+               enum lttng_stream_type type,
+               const struct ltt_session& session,
+               const char *base_path_override,
+               const uint64_t *current_chunk_id);
+int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock, int pipe);
+int consumer_send_destroy_relayd(struct consumer_socket *sock, struct consumer_output *consumer);
 int consumer_recv_status_reply(struct consumer_socket *sock);
 int consumer_recv_status_channel(struct consumer_socket *sock,
                uint64_t *key, unsigned int *stream_count);