Replace libuuid with internal implementation

[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 a1be2d0a029c72e6ddb0fb2b4abd8f66a9136e2e..8c2a47538535e2e190a0d72c77b0d8d9b80f9cf9 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>
 
@@ -543,7 +543,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 */
@@ -632,7 +632,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];
@@ -693,6 +693,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>