Use a "comm" variant of the LTTNG_OPTIONAL helper in sessiond-comm

[lttng-tools.git] / src / common / sessiond-comm / relayd.h

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 1a58d5989e6358b68fbfd50f15d8e750a1bb8891..b5948cc4a10b7a9d3d6838d7fd89ef4a63ed5d53 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -25,6 +25,8 @@
 #include <lttng/lttng.h>
 #include <common/defaults.h>
 #include <common/index/ctf-index.h>
+#include <common/macros.h>
+#include <common/compat/uuid.h>
 
 #define RELAYD_VERSION_COMM_MAJOR             VERSION_MAJOR
 #define RELAYD_VERSION_COMM_MINOR             VERSION_MINOR
@@ -89,6 +91,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;
        char names[];
 } LTTNG_PACKED;
 
@@ -204,6 +207,10 @@ 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;
        /* Contains the session_name and hostname */
        char names[];
 } LTTNG_PACKED;
@@ -228,27 +235,4 @@ 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 {
-       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[];
-} LTTNG_PACKED;
-
 #endif /* _RELAYD_COMM */