X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Frelayd.h;h=1fc48c442b4e52b68391683fd3a3f392ce3eb038;hp=03460de38566cdb7ec42b13a6c0e4d2a55f44f1d;hb=93ec662e687dc15a3601704a1e0c96c51ad228c9;hpb=a9e87764ffd56e6ab80432395223c1a5d7f7a8ac

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 03460de38..1fc48c442 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -19,16 +19,15 @@
 #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/ctf-index.h>
 
-#define RELAYD_VERSION_COMM_MAJOR             2
-#define RELAYD_VERSION_COMM_MINOR             1
+#define RELAYD_VERSION_COMM_MAJOR             VERSION_MAJOR
+#define RELAYD_VERSION_COMM_MINOR             VERSION_MINOR
 
 /*
  * lttng-relayd communication header.
@@ -37,7 +36,7 @@ struct lttcomm_relayd_hdr {
 	/* Circuit ID not used for now so always ignored */
 	uint64_t circuit_id;
 	uint64_t data_size;		/* data size following this header */
-	uint32_t cmd;			/* enum lttcomm_sessiond_command */
+	uint32_t cmd;			/* enum lttcomm_relayd_command */
 	uint32_t cmd_version;	/* command version */
 } LTTNG_PACKED;
 
@@ -66,7 +65,18 @@ struct lttcomm_relayd_status_session {
  */
 struct lttcomm_relayd_add_stream {
 	char channel_name[DEFAULT_STREAM_NAME_LEN];
-	char pathname[PATH_MAX];
+	char pathname[LTTNG_PATH_MAX];
+} LTTNG_PACKED;
+
+/*
+ * Used to add a stream on the relay daemon.
+ * Protocol version 2.2
+ */
+struct lttcomm_relayd_add_stream_2_2 {
+	char channel_name[DEFAULT_STREAM_NAME_LEN];
+	char pathname[LTTNG_PATH_MAX];
+	uint64_t tracefile_size;
+	uint64_t tracefile_count;
 } LTTNG_PACKED;
 
 /*
@@ -133,4 +143,43 @@ struct lttcomm_relayd_end_data_pending {
 	uint64_t session_id;
 } LTTNG_PACKED;
 
+struct lttcomm_relayd_quiescent_control {
+	uint64_t stream_id;
+} LTTNG_PACKED;
+
+/*
+ * Index data.
+ */
+struct lttcomm_relayd_index {
+	uint64_t relay_stream_id;
+	uint64_t net_seq_num;
+	uint64_t packet_size;
+	uint64_t content_size;
+	uint64_t timestamp_begin;
+	uint64_t timestamp_end;
+	uint64_t events_discarded;
+	uint64_t stream_id;
+	uint64_t stream_instance_id;
+	uint64_t packet_seq_num;
+} LTTNG_PACKED;
+
+/*
+ * 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];
+	uint32_t live_timer;
+	uint32_t snapshot;
+} 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;
+
 #endif	/* _RELAYD_COMM */