Propagate trace format to relayd on session creation

[deliverable/lttng-tools.git] / src / bin / lttng-relayd / session.hpp

diff --git a/src/bin/lttng-relayd/session.hpp b/src/bin/lttng-relayd/session.hpp
index 986eca68f041868b569ead28977034f8aaa88d2d..e780641a3f1bdaf756f22bc2635e4c42b837cb4b 100644 (file)
--- a/src/bin/lttng-relayd/session.hpp
+++ b/src/bin/lttng-relayd/session.hpp
@@ -10,17 +10,18 @@
  *
  */
 
-#include <limits.h>
 #include <inttypes.h>
+#include <limits.h>
 #include <pthread.h>
 #include <urcu/list.h>
 #include <urcu/ref.h>
 
-#include <lttng/constant.h>
 #include <common/hashtable/hashtable.hpp>
-#include <common/uuid.hpp>
-#include <common/trace-chunk.hpp>
 #include <common/optional.hpp>
+#include <common/sessiond-comm/relayd.hpp>
+#include <common/trace-chunk.hpp>
+#include <common/uuid.hpp>
+#include <lttng/constant.h>
 
 /*
  * Represents a session for the relay point of view
@@ -135,11 +136,13 @@ struct relay_session {
         */
        bool ongoing_rotation;
        struct lttng_directory_handle *output_directory;
+       enum relayd_trace_format trace_format;
        struct rcu_head rcu_node;       /* For call_rcu teardown. */
 };
 
 struct relay_session *session_create(const char *session_name,
-               const char *hostname, const char *base_path,
+               const char *hostname,
+               const char *base_path,
                uint32_t live_timer,
                bool snapshot,
                const lttng_uuid& sessiond_uuid,
@@ -148,7 +151,8 @@ struct relay_session *session_create(const char *session_name,
                const time_t *creation_time,
                uint32_t major,
                uint32_t minor,
-               bool session_name_contains_creation_timestamp);
+               bool session_name_contains_creation_timestamp,
+               enum relayd_trace_format trace_format);
 struct relay_session *session_get_by_id(uint64_t id);
 bool session_get(struct relay_session *session);
 void session_put(struct relay_session *session);