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 4d751b86d91d22dee618f2231342cebddc8d5e08..eb3e5f118bfdadbf0af3cfc7223d1df2792e182f 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -159,7 +159,29 @@ 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.
@@ -171,4 +193,13 @@ struct lttcomm_relayd_create_session_2_4 {
        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 */