sessiond-comm: Document feature branch specific commands range

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.h

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 6fc65a103167b8a5db13fa99dcc24b1820906fb9..91ae741e9ec9d7497db51838aa85a16511aae49f 100644 (file)
--- 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 {
@@ -139,6 +140,8 @@ enum lttcomm_relayd_command {
        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. */
 };
 
 /*
@@ -543,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 */
@@ -693,14 +696,14 @@ struct lttcomm_consumer_status_channel {
        unsigned int stream_count;
 } LTTNG_PACKED;
 
-#ifdef HAVE_LIBLTTNG_UST_CTL
-
 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>
 
 /*