X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Frelayd.h;h=74d5b1176be637601edac2e342d08a0fd56ae11f;hb=a1ae2ea59428174575b7328b1062a6248d636b72;hp=24c4c6e84336584f986921bddbdbf212b9ad686b;hpb=7d2f74525fbda4dcc744f33ea26c911545b5df13;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 24c4c6e84..74d5b1176 100644
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -19,15 +19,12 @@
 #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
@@ -68,7 +65,7 @@ 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;
 
 /*
@@ -77,7 +74,7 @@ struct lttcomm_relayd_add_stream {
  */
 struct lttcomm_relayd_add_stream_2_2 {
 	char channel_name[DEFAULT_STREAM_NAME_LEN];
-	char pathname[PATH_MAX];
+	char pathname[LTTNG_PATH_MAX];
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
 } LTTNG_PACKED;
@@ -97,13 +94,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,16 +152,53 @@ 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[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;
+
+struct lttcomm_relayd_mkdir {
+	/* Includes trailing NULL */
+	uint32_t length;
+	char path[];
+} LTTNG_PACKED;
+
 #endif	/* _RELAYD_COMM */