Fix: relayd vs consumerd compatibility

[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 bc27b0ed4e0ef764d0bf0e1af92bb30ec93ccdc2..eb3e5f118bfdadbf0af3cfc7223d1df2792e182f 100644 (file)
--- 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;
@@ -162,15 +159,47 @@ 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;
 
 #endif /* _RELAYD_COMM */