X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.hpp;h=0c2260ea72677bd2a03ea9add252d43687be48a9;hb=8476ce3accaeef254840cf149bf6c063dbf839f9;hp=c0dcf5aca71d5d84c73b3effaeff3060feda6f33;hpb=026a8516dce445ce5a6fa00fbd5e62118a5a8060;p=deliverable%2Flttng-tools.git

diff --git a/src/common/relayd/relayd.hpp b/src/common/relayd/relayd.hpp
index c0dcf5aca..0c2260ea7 100644
--- a/src/common/relayd/relayd.hpp
+++ b/src/common/relayd/relayd.hpp
@@ -8,13 +8,14 @@
 #ifndef _RELAYD_H
 #define _RELAYD_H
 
-#include <unistd.h>
 #include <stdbool.h>
+#include <unistd.h>
 
+#include <common/dynamic-array.hpp>
 #include <common/sessiond-comm/relayd.hpp>
 #include <common/sessiond-comm/sessiond-comm.hpp>
 #include <common/trace-chunk.hpp>
-#include <common/dynamic-array.hpp>
+#include <lttng/trace-format-descriptor-internal.hpp>
 
 struct relayd_stream_rotation_position {
 	uint64_t stream_id;
@@ -31,16 +32,25 @@ int relayd_connect(struct lttcomm_relayd_sock *sock);
 int relayd_close(struct lttcomm_relayd_sock *sock);
 int relayd_create_session(struct lttcomm_relayd_sock *rsock,
 		uint64_t *relayd_session_id,
-		const char *session_name, const char *hostname,
-		const char *base_path, int session_live_timer,
-		unsigned int snapshot, uint64_t sessiond_session_id,
+		const char *session_name,
+		const char *hostname,
+		const char *base_path,
+		int session_live_timer,
+		unsigned int snapshot,
+		uint64_t sessiond_session_id,
 		const lttng_uuid& sessiond_uuid,
 		const uint64_t *current_chunk_id,
-		time_t creation_time, bool session_name_contains_creation_time,
-		char *output_path);
-int relayd_add_stream(struct lttcomm_relayd_sock *sock, const char *channel_name,
-		const char *domain_name, const char *pathname, uint64_t *stream_id,
-		uint64_t tracefile_size, uint64_t tracefile_count,
+		time_t creation_time,
+		bool session_name_contains_creation_time,
+		char *output_path,
+		lttng::trace_format_descriptor& trace_format);
+int relayd_add_stream(struct lttcomm_relayd_sock *sock,
+		const char *channel_name,
+		const char *domain_name,
+		const char *pathname,
+		uint64_t *stream_id,
+		uint64_t tracefile_size,
+		uint64_t tracefile_count,
 		struct lttng_trace_chunk *trace_chunk);
 int relayd_streams_sent(struct lttcomm_relayd_sock *rsock);
 int relayd_send_close_stream(struct lttcomm_relayd_sock *sock, uint64_t stream_id,