Pass the consumerd stream's trace archive id to the relayd

[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 3df68682a60c8fc9038dd71f10567062dc4031d1..b09dd138dfb4777f46b533a694e21f19f2e93c8e 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -19,19 +19,21 @@
 #ifndef _RELAYD_COMM
 #define _RELAYD_COMM
 
-#define _GNU_SOURCE
-
 #include <limits.h>
 #include <stdint.h>
 
 #include <lttng/lttng.h>
 #include <common/defaults.h>
-#include <common/index/lttng-index.h>
-#include <config.h>
+#include <common/index/ctf-index.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.
  */
@@ -67,8 +69,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[PATH_MAX];
+       char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+       char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
 } LTTNG_PACKED;
 
 /*
@@ -76,10 +78,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[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_archive_id;
+       char names[];
 } LTTNG_PACKED;
 
 /*
@@ -97,13 +108,6 @@ struct lttcomm_relayd_generic_reply {
        uint32_t ret_code;
 } LTTNG_PACKED;
 
-/*
- * Used to update synchronization information.
- */
-struct lttcomm_relayd_update_sync_info {
-       /* TODO: fill the structure. Feature not implemented yet */
-} LTTNG_PACKED;
-
 /*
  * Version command.
  */
@@ -162,6 +166,90 @@ struct lttcomm_relayd_index {
        uint64_t timestamp_end;
        uint64_t events_discarded;
        uint64_t stream_id;
+       /* 2.8+ */
+       uint64_t stream_instance_id;
+       uint64_t packet_seq_num;
+} LTTNG_PACKED;
+
+static inline size_t lttcomm_relayd_index_len(uint32_t major, uint32_t minor)
+{
+       if (major == 1) {
+               switch (minor) {
+               case 0:
+                       return offsetof(struct lttcomm_relayd_index, stream_id)
+                               + member_sizeof(struct lttcomm_relayd_index,
+                                               stream_id);
+               case 1:
+                       return offsetof(struct lttcomm_relayd_index, packet_seq_num)
+                               + member_sizeof(struct lttcomm_relayd_index,
+                                               packet_seq_num);
+               default:
+                       abort();
+               }
+       }
+       abort();
+}
+
+/*
+ * Create session in 2.4 adds additionnal parameters for live reading.
+ */
+struct lttcomm_relayd_create_session_2_4 {
+       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;
+       /* 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).
+ */
+struct lttcomm_relayd_reset_metadata {
+       uint64_t stream_id;
+       uint64_t version;
+} LTTNG_PACKED;
+
+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. */
+       uint32_t pathname_length;
+       /* Must be the last member of this structure. */
+       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 */