X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=91ae741e9ec9d7497db51838aa85a16511aae49f;hp=aeefdaaa6b95b076a804c54299bfbdf1a8425276;hb=3fe73a46ff32e8458c410daf1307503b7becf75e;hpb=bbc4768c20f1c552222e1746f9475d145d7bf04e

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index aeefdaaa6..91ae741e9 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -35,7 +35,7 @@
 #include <common/compat/socket.h>
 #include <common/uri.h>
 #include <common/defaults.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 #include <common/macros.h>
 #include <common/optional.h>
 
@@ -107,7 +107,8 @@ enum lttcomm_sessiond_command {
 	LTTNG_ROTATION_GET_INFO               = 46,
 	LTTNG_ROTATION_SET_SCHEDULE           = 47,
 	LTTNG_SESSION_LIST_ROTATION_SCHEDULES = 48,
-	LTTNG_CREATE_SESSION_EXT              = 49
+	LTTNG_CREATE_SESSION_EXT              = 49,
+	LTTNG_CLEAR_SESSION                   = 50,
 };
 
 enum lttcomm_relayd_command {
@@ -131,12 +132,16 @@ enum lttcomm_relayd_command {
 	RELAYD_STREAMS_SENT                 = 16,
 	/* Ask the relay to reset the metadata trace file (2.8+) */
 	RELAYD_RESET_METADATA               = 17,
-	/* Ask the relay to rotate a stream file (2.11+) */
-	RELAYD_ROTATE_STREAM                = 18,
+	/* Ask the relay to rotate a set of stream files (2.11+) */
+	RELAYD_ROTATE_STREAMS                = 18,
 	/* Ask the relay to create a trace chunk (2.11+) */
 	RELAYD_CREATE_TRACE_CHUNK           = 19,
 	/* Ask the relay to close a trace chunk (2.11+) */
 	RELAYD_CLOSE_TRACE_CHUNK            = 20,
+	/* Ask the relay whether a trace chunk exists (2.11+) */
+	RELAYD_TRACE_CHUNK_EXISTS           = 21,
+
+	/* Feature branch specific commands start at 10000. */
 };
 
 /*
@@ -541,7 +546,7 @@ struct lttcomm_consumer_msg {
 			uint64_t key;				/* Unique channel key. */
 			/* ID of the session's current trace chunk. */
 			LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
-			unsigned char uuid[UUID_LEN];	/* uuid for ust tracer. */
+			unsigned char uuid[LTTNG_UUID_LEN];	/* uuid for ust tracer. */
 			uint32_t chan_id;			/* Channel ID on the tracer side. */
 			uint64_t tracefile_size;	/* bytes */
 			uint32_t tracefile_count;	/* number of tracefiles */
@@ -630,7 +635,7 @@ struct lttcomm_consumer_msg {
 			 * (relayd_id unset).
 			 *
 			 * `override_name` is left NULL (all-zeroes) if the
-			 * chunk's name is not overriden.
+			 * chunk's name is not overridden.
 			 */
 			LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
 			char override_name[LTTNG_NAME_MAX];
@@ -691,6 +696,12 @@ struct lttcomm_consumer_status_channel {
 	unsigned int stream_count;
 } LTTNG_PACKED;
 
+struct lttcomm_consumer_close_trace_chunk_reply {
+	enum lttcomm_return_code ret_code;
+	uint32_t path_length;
+	char path[];
+};
+
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
 #include <lttng/ust-abi.h>