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

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index bc27b0ed4..f86dde3d1 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -19,19 +19,24 @@
 #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>
+#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.
  */
@@ -67,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[PATH_MAX];
+	char channel_name[RELAYD_COMM_DEFAULT_STREAM_NAME_LEN];
+	char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
 } LTTNG_PACKED;
 
 /*
@@ -76,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[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 +111,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,15 +169,81 @@ struct lttcomm_relayd_index {
 	uint64_t timestamp_end;
 	uint64_t events_discarded;
 	uint64_t stream_id;
-} LTTNG_PACKED;
+	/* 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[NAME_MAX];
-	char hostname[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;
+	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).
+ */
+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_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;
 
 #endif	/* _RELAYD_COMM */