Fix: missing include can cause structures to not be packed

[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 62224bd75db8cf24f5e3ece8739eed6a51b6363e..c0c6a8bba9f1ed64cbcd980769c2b16b2b353df8 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -36,6 +36,7 @@
 #include <common/uri.h>
 #include <common/defaults.h>
 #include <common/compat/uuid.h>
+#include <common/macros.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -104,8 +105,7 @@ enum lttcomm_sessiond_command {
        LTTNG_ROTATE_SESSION                  = 45,
        LTTNG_ROTATION_GET_INFO               = 46,
        LTTNG_ROTATION_SET_SCHEDULE           = 47,
-       LTTNG_SESSION_GET_CURRENT_OUTPUT      = 48,
-       LTTNG_SESSION_LIST_ROTATION_SCHEDULES = 49,
+       LTTNG_SESSION_LIST_ROTATION_SCHEDULES = 48,
 };
 
 enum lttcomm_relayd_command {
@@ -165,6 +165,12 @@ enum lttcomm_return_code {
        LTTCOMM_CONSUMERD_CHANNEL_FAIL,             /* Channel creation failed. */
        LTTCOMM_CONSUMERD_CHAN_NOT_FOUND,           /* Channel not found. */
        LTTCOMM_CONSUMERD_ALREADY_SET,              /* Resource already set. */
+       LTTCOMM_CONSUMERD_ROTATION_FAIL,            /* Rotation has failed. */
+       LTTCOMM_CONSUMERD_ROTATE_RENAME_FAILED,     /* Rotation rename has failed. */
+       LTTCOMM_CONSUMERD_ROTATION_PENDING_LOCAL_FAILED, /* Rotation pending relay failed. */
+       LTTCOMM_CONSUMERD_ROTATION_PENDING_RELAY_FAILED, /* Rotation pending relay failed. */
+       LTTCOMM_CONSUMERD_MKDIR_FAILED,             /* mkdir has failed. */
+       LTTCOMM_CONSUMERD_SNAPSHOT_FAILED,          /* snapshot has failed. */
 
        /* MUST be last element */
        LTTCOMM_NR,                                             /* Last element */
@@ -410,6 +416,11 @@ struct lttcomm_event_extended_header {
         * character.
         */
        uint32_t nb_exclusions;
+
+       /*
+        * Size of the event's userspace probe location (if applicable).
+        */
+       uint32_t userspace_probe_location_len;
 } LTTNG_PACKED;
 
 /*
@@ -433,7 +444,7 @@ struct lttcomm_lttng_output_id {
  * operation.
  */
 struct lttcomm_consumer_msg {
-       uint32_t cmd_type;      /* enum consumerd_command */
+       uint32_t cmd_type;      /* enum lttng_consumer_command */
        union {
                struct {
                        uint64_t channel_key;
@@ -598,11 +609,15 @@ struct lttcomm_consumer_msg {
                        uint32_t uid;
                        uint32_t gid;
                } LTTNG_PACKED rotate_rename;
+               struct {
+                       uint64_t session_id;
+                       uint64_t chunk_id;
+               } LTTNG_PACKED check_rotation_pending_local;
                struct {
                        uint64_t relayd_id;
                        uint64_t session_id;
                        uint64_t chunk_id;
-               } LTTNG_PACKED rotate_pending_relay;
+               } LTTNG_PACKED check_rotation_pending_relay;
                struct {
                        char path[LTTNG_PATH_MAX];
                        uint64_t relayd_id; /* Relayd id if apply. */