X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=0c2667031b55bd5603adaca04b09bf5fcab808c1;hp=a60fc4506a9c63b42cc36300a79e08b125e69802;hb=b812e5ca9073ddac9cf8db747eb6cf9bea78b85a;hpb=fb83fe64f250bec7416f18891a8264450c61ead3

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index a60fc4506..0c2667031 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -40,7 +40,7 @@
 
 #include "inet.h"
 #include "inet6.h"
-#include "unix.h"
+#include <common/unix.h>
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -56,7 +56,7 @@
 enum lttcomm_sessiond_command {
 	/* Tracer command */
 	LTTNG_ADD_CONTEXT                   = 0,
-	LTTNG_CALIBRATE                     = 1,
+	/* LTTNG_CALIBRATE used to be here */
 	LTTNG_DISABLE_CHANNEL               = 2,
 	LTTNG_DISABLE_EVENT                 = 3,
 	LTTNG_LIST_SYSCALLS                 = 4,
@@ -94,6 +94,8 @@ enum lttcomm_sessiond_command {
 	LTTNG_UNTRACK_PID                   = 33,
 	LTTNG_LIST_TRACKER_PIDS             = 34,
 	LTTNG_SET_SESSION_SHM_PATH          = 40,
+	LTTNG_REGENERATE_METADATA           = 41,
+	LTTNG_REGENERATE_STATEDUMP          = 42,
 };
 
 enum lttcomm_relayd_command {
@@ -115,6 +117,8 @@ enum lttcomm_relayd_command {
 	RELAYD_LIST_SESSIONS                = 15,
 	/* All streams of the channel have been sent to the relayd (2.4+). */
 	RELAYD_STREAMS_SENT                 = 16,
+	/* Ask the relay to reset the metadata trace file (2.8+) */
+	RELAYD_RESET_METADATA               = 17,
 };
 
 /*
@@ -486,6 +490,7 @@ struct lttcomm_consumer_msg {
 			uint64_t key;	/* Metadata channel key. */
 			uint64_t target_offset;	/* Offset in the consumer */
 			uint64_t len;	/* Length of metadata to be received. */
+			uint64_t version; /* Version of the metadata. */
 		} LTTNG_PACKED push_metadata;
 		struct {
 			uint64_t key;	/* Metadata channel key. */
@@ -496,6 +501,9 @@ struct lttcomm_consumer_msg {
 		struct {
 			uint64_t key;	/* Channel key. */
 		} LTTNG_PACKED flush_channel;
+		struct {
+			uint64_t key;	/* Channel key. */
+		} LTTNG_PACKED clear_quiescent_channel;
 		struct {
 			char pathname[PATH_MAX];
 			/* Indicate if the snapshot goes on the relayd or locally. */
@@ -517,6 +525,9 @@ struct lttcomm_consumer_msg {
 			uint64_t session_id;
 			uint64_t channel_key;
 		} LTTNG_PACKED lost_packets;
+		struct {
+			uint64_t session_id;
+		} LTTNG_PACKED regenerate_metadata;
 	} u;
 } LTTNG_PACKED;