X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=d5009740e45da8ad96263226d4db80929f0fed25;hb=0ebdafe0e5c235d2e4ce6d4dcff48bfd9a77a479;hp=3b0093bfbc9e0d7d06d598a74ba6cace921ab6a2;hpb=823a1989a3420eab1f5b17703ee2807bca2512a8;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 3b0093bfb..d5009740e 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -133,12 +133,8 @@ enum lttcomm_relayd_command {
 	RELAYD_RESET_METADATA               = 17,
 	/* Ask the relay to rotate a stream file (2.11+) */
 	RELAYD_ROTATE_STREAM                = 18,
-	/* Rename a chunk after the rotation is completed (2.11+) */
-	RELAYD_ROTATE_RENAME                = 19,
-	/* Check if a chunk has data pending (2.11+) */
-	RELAYD_ROTATE_PENDING               = 20,
-	/* Create a folder on the relayd FS (2.11+) */
-	RELAYD_MKDIR                        = 21,
+	/* Ask the relay to create a trace chunk (2.11+) */
+	RELAYD_CREATE_TRACE_CHUNK           = 19,
 };
 
 /*
@@ -480,7 +476,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. */
@@ -542,7 +538,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 */
@@ -634,24 +630,24 @@ 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;
 			uint64_t creation_timestamp;
-			struct {
+			LTTNG_OPTIONAL_COMM(struct {
 				uint32_t uid;
 				uint32_t gid;
-			} LTTNG_PACKED credentials;
+			} LTTNG_PACKED ) 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;