X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Frelayd.h;h=f86dde3d1243d70f26769e9efaa893fed1a89a66;hp=306e2e4dd7bcd8e25c6f4caf5b0440c07e952105;hb=1b0bebcb6f1a5230aedfcbab78623bb5eac633d5;hpb=1c17e4246f09572fcf8a24413017d8b5574c6eba

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 306e2e4dd..f86dde3d1 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -25,6 +25,9 @@
 #include <lttng/lttng.h>
 #include <common/defaults.h>
 #include <common/index/ctf-index.h>
+#include <common/macros.h>
+#include <common/compat/uuid.h>
+#include <common/optional.h>
 
 #define RELAYD_VERSION_COMM_MAJOR             VERSION_MAJOR
 #define RELAYD_VERSION_COMM_MINOR             VERSION_MINOR
@@ -84,6 +87,15 @@ struct lttcomm_relayd_add_stream_2_2 {
 	uint64_t tracefile_count;
 } LTTNG_PACKED;
 
+struct lttcomm_relayd_add_stream_2_11 {
+	uint32_t channel_name_len;
+	uint32_t pathname_len;
+	uint64_t tracefile_size;
+	uint64_t tracefile_count;
+	uint64_t trace_archive_id;
+	char names[];
+} LTTNG_PACKED;
+
 /*
  * Answer from an add stream command.
  */
@@ -191,6 +203,20 @@ struct lttcomm_relayd_create_session_2_4 {
 	uint32_t snapshot;
 } LTTNG_PACKED;
 
+struct lttcomm_relayd_create_session_2_11 {
+	uint32_t session_name_len;
+	uint32_t hostname_len;
+	uint32_t live_timer;
+	uint8_t snapshot;
+	/* Sessiond instance UUID */
+	lttng_uuid sessiond_uuid;
+	/* Sessiond session id */
+        uint64_t session_id;
+	LTTNG_OPTIONAL_COMM(uint64_t) current_chunk_id;
+	/* Contains the session_name and hostname */
+	char names[];
+} LTTNG_PACKED;
+
 /*
  * Used to ask the relay to reset the metadata trace file (regeneration).
  * Send the new version of the metadata (starts at 0).
@@ -211,27 +237,13 @@ struct lttcomm_relayd_rotate_stream {
 	char new_pathname[];
 } LTTNG_PACKED;
 
-struct lttcomm_relayd_rotate_rename {
-	uint32_t old_path_length;
-	uint32_t new_path_length;
-	/* Concatenation of the old and new paths, separated by \0. */
-	char paths[];
-} LTTNG_PACKED;
-
-struct lttcomm_relayd_rotate_pending {
+struct lttcomm_relayd_create_trace_chunk {
 	uint64_t chunk_id;
-} LTTNG_PACKED;
-
-struct lttcomm_relayd_rotate_pending_reply {
-	struct lttcomm_relayd_generic_reply generic;
-	/* Valid values are [0, 1]. */
-	uint8_t is_pending;
-} LTTNG_PACKED;
-
-struct lttcomm_relayd_mkdir {
-	/* Includes trailing NULL */
-	uint32_t length;
-	char path[];
+	/* Seconds since EPOCH. */
+	uint64_t creation_timestamp;
+	/* Includes trailing NULL. */
+	uint32_t override_name_length;
+	char override_name[];
 } LTTNG_PACKED;
 
 #endif	/* _RELAYD_COMM */