Fix: remove assertions of the existence of a trace chunk

[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 444c43af0aae454b32ecb8b86aedf33ed681f1b2..47f1d5cd738327290e91b27a91ee8b765522cde3 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -25,10 +25,18 @@
 #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
 
+#define RELAYD_COMM_LTTNG_HOST_NAME_MAX_2_4    64
+#define RELAYD_COMM_LTTNG_NAME_MAX_2_4 255
+#define RELAYD_COMM_LTTNG_PATH_MAX     4096
+#define RELAYD_COMM_DEFAULT_STREAM_NAME_LEN    264 /* 256 + 8 */
+
 /*
  * lttng-relayd communication header.
  */
@@ -64,8 +72,8 @@ struct lttcomm_relayd_status_session {
  * Used to add a stream on the relay daemon.
  */
 struct lttcomm_relayd_add_stream {
-       char channel_name[DEFAULT_STREAM_NAME_LEN];
-       char pathname[LTTNG_PATH_MAX];
+       char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+       char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
 } LTTNG_PACKED;
 
 /*
@@ -73,10 +81,19 @@ struct lttcomm_relayd_add_stream {
  * Protocol version 2.2
  */
 struct lttcomm_relayd_add_stream_2_2 {
-       char channel_name[DEFAULT_STREAM_NAME_LEN];
-       char pathname[LTTNG_PATH_MAX];
+       char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+       char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
+       uint64_t tracefile_size;
+       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_chunk_id;
+       char names[];
 } LTTNG_PACKED;
 
 /*
@@ -180,12 +197,28 @@ static inline size_t lttcomm_relayd_index_len(uint32_t major, uint32_t minor)
  * Create session in 2.4 adds additionnal parameters for live reading.
  */
 struct lttcomm_relayd_create_session_2_4 {
-       char session_name[LTTNG_NAME_MAX];
-       char hostname[LTTNG_HOST_NAME_MAX];
+       char session_name[RELAYD_COMM_LTTNG_NAME_MAX_2_4];
+       char hostname[RELAYD_COMM_LTTNG_HOST_NAME_MAX_2_4];
        uint32_t live_timer;
        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;
+       /* 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;
+
 /*
  * Used to ask the relay to reset the metadata trace file (regeneration).
  * Send the new version of the metadata (starts at 0).
@@ -197,6 +230,7 @@ struct lttcomm_relayd_reset_metadata {
 
 struct lttcomm_relayd_rotate_stream {
        uint64_t stream_id;
+       /* Ignored for metadata streams. */
        uint64_t rotate_at_seq_num;
        uint64_t new_chunk_id;
        /* Includes trailing NULL. */
@@ -205,17 +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[];
+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_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 */