X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=c0c6a8bba9f1ed64cbcd980769c2b16b2b353df8;hp=3a2dd4946423aabb2a4299306eebae5ae5ab403b;hb=aa52c9865e22402a2e310b5b770ae0352b6a0be0;hpb=2c2de71ef6dae09fa1a61f02051b68f60b0a1750

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 3a2dd4946..c0c6a8bba 100644
--- 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>
@@ -164,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 */
@@ -437,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;
@@ -602,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. */