Use a "comm" variant of the LTTNG_OPTIONAL helper in sessiond-comm

[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 d673c6e19c2a0dc7ad591c18b8e3be851a088d72..d9177cf37d8554c723e94a80a448839071042fc6 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -445,6 +445,14 @@ struct lttcomm_event_extended_header {
        uint32_t userspace_probe_location_len;
 } LTTNG_PACKED;
 
+/*
+ * Command header of the reply to an LTTNG_DESTROY_SESSION command.
+ */
+struct lttcomm_session_destroy_command_header {
+       /* enum lttng_session */
+       int32_t rotation_state;
+};
+
 /*
  * Data structure for the response from sessiond to the lttng client.
  */
@@ -472,7 +480,7 @@ struct lttcomm_consumer_msg {
                        uint64_t channel_key;
                        uint64_t session_id;
                        /* ID of the session's current trace chunk. */
-                       LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED chunk_id;
+                       LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
                        char pathname[PATH_MAX];
                        uint64_t relayd_id;
                        /* nb_init_streams is the number of streams open initially. */
@@ -534,7 +542,7 @@ struct lttcomm_consumer_msg {
                        uint64_t relayd_id;                     /* Relayd id if apply. */
                        uint64_t key;                           /* Unique channel key. */
                        /* ID of the session's current trace chunk. */
-                       LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED chunk_id;
+                       LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
                        unsigned char uuid[UUID_LEN];   /* uuid for ust tracer. */
                        uint32_t chan_id;                       /* Channel ID on the tracer side. */
                        uint64_t tracefile_size;        /* bytes */
@@ -626,7 +634,7 @@ struct lttcomm_consumer_msg {
                         * `override_name` is left NULL (all-zeroes) if the
                         * chunk's name is not overriden.
                         */
-                       LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+                       LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
                        char override_name[LTTNG_NAME_MAX];
                        uint64_t session_id;
                        uint64_t chunk_id;
@@ -637,13 +645,13 @@ struct lttcomm_consumer_msg {
                        } LTTNG_PACKED credentials;
                } LTTNG_PACKED create_trace_chunk;
                struct {
-                       LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+                       LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
                        uint64_t session_id;
                        uint64_t chunk_id;
                        uint64_t close_timestamp;
                } LTTNG_PACKED close_trace_chunk;
                struct {
-                       LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+                       LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
                        uint64_t session_id;
                        uint64_t chunk_id;
                } LTTNG_PACKED trace_chunk_exists;