X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Frelayd.h;h=47f1d5cd738327290e91b27a91ee8b765522cde3;hp=579a41df19355261186691263893b1ed6298fbc4;hb=7fd975c523ee6e0bb45dcb13b7308b8d9d6406ba;hpb=aa52c9865e22402a2e310b5b770ae0352b6a0be0

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 579a41df1..47f1d5cd7 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -26,6 +26,8 @@
 #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
@@ -90,7 +92,7 @@ struct lttcomm_relayd_add_stream_2_11 {
 	uint32_t pathname_len;
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
-	uint64_t trace_archive_id;
+	uint64_t trace_chunk_id;
 	char names[];
 } LTTNG_PACKED;
 
@@ -206,6 +208,13 @@ struct lttcomm_relayd_create_session_2_11 {
 	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;
+	/* Session creation time, in seconds since UNIX Epoch. */
+	uint64_t creation_time;
+	LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED current_chunk_id;
 	/* Contains the session_name and hostname */
 	char names[];
 } LTTNG_PACKED;
@@ -230,27 +239,21 @@ 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;
+	/* Seconds since EPOCH. */
+	uint64_t creation_timestamp;
+	/* Includes trailing NULL. */
+	uint32_t override_name_length;
+	char override_name[];
 } 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[];
+struct lttcomm_relayd_close_trace_chunk {
+	uint64_t chunk_id;
+	/* Seconds since EPOCH. */
+	uint64_t close_timestamp;
+	/* enum lttng_trace_chunk_command_type */
+	LTTNG_OPTIONAL_COMM(uint32_t) LTTNG_PACKED close_command;
 } LTTNG_PACKED;
 
 #endif	/* _RELAYD_COMM */