X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.hpp;h=9894e9ba9d6512628478e2b525126dd5bb8c6e25;hb=6c1db447784d69988f661477ad9eea7c0fddfa82;hp=ae3111855468f19a1c5551fd2f802e026694a88a;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.hpp b/src/common/sessiond-comm/sessiond-comm.hpp
index ae3111855..9894e9ba9 100644
--- a/src/common/sessiond-comm/sessiond-comm.hpp
+++ b/src/common/sessiond-comm/sessiond-comm.hpp
@@ -49,6 +49,7 @@
 #endif
 
 enum lttcomm_sessiond_command {
+	LTTCOMM_SESSIOND_COMMAND_MIN                    = -1,
 	/* Tracer command */
 	LTTNG_ADD_CONTEXT                               = 0,
 	/* LTTNG_CALIBRATE used to be here */
@@ -103,8 +104,15 @@ enum lttcomm_sessiond_command {
 	LTTNG_CLEAR_SESSION                             = 50,
 	LTTNG_LIST_TRIGGERS                             = 51,
 	LTTNG_EXECUTE_ERROR_QUERY                       = 52,
+	LTTCOMM_SESSIOND_COMMAND_MAX,
 };
 
+static inline
+bool lttcomm_sessiond_command_is_valid(enum lttcomm_sessiond_command cmd)
+{
+	return cmd > LTTCOMM_SESSIOND_COMMAND_MIN && cmd < LTTCOMM_SESSIOND_COMMAND_MAX;
+}
+
 static inline
 const char *lttcomm_sessiond_command_str(enum lttcomm_sessiond_command cmd)
 {
@@ -830,7 +838,7 @@ struct lttcomm_consumer_msg {
 			uint64_t chunk_id;
 		} LTTNG_PACKED trace_chunk_exists;
 		struct {
-			lttng_uuid sessiond_uuid;
+			uint8_t sessiond_uuid[LTTNG_UUID_LEN];
 		} LTTNG_PACKED init;
 		struct {
 			uint64_t key;
@@ -848,6 +856,8 @@ struct lttcomm_consumer_msg {
 struct lttcomm_consumer_channel_monitor_msg {
 	/* Key of the sampled channel. */
 	uint64_t key;
+	/* Id of the sampled channel's session. */
+	uint64_t session_id;
 	/*
 	 * Lowest and highest usage (bytes) at the moment the sample was taken.
 	 */
@@ -855,7 +865,7 @@ struct lttcomm_consumer_channel_monitor_msg {
 	/*
 	 * Sum of all the consumed positions for a channel.
 	 */
-	uint64_t total_consumed;
+	uint64_t consumed_since_last_sample;
 } LTTNG_PACKED;
 
 /*