X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=2db5ba46938625163b150b271882299aac146459;hb=166fc58650170d8213cd7d43c68d9a6601336dd0;hp=b9ab05bcb26e3e34b7c765dd93094ad8846541c7;hpb=bad7720255c69c06010ccec2a8f6fedf3387e51d;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index b9ab05bcb..2db5ba469 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -278,42 +278,15 @@ struct lttcomm_session_msg {
 		/* Event data */
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			struct lttng_event event LTTNG_PACKED;
-			/* Length of following filter expression. */
-			uint32_t expression_len;
-			/* Length of following bytecode for filter. */
-			uint32_t bytecode_len;
-			/* Exclusion count (fixed-size strings). */
-			uint32_t exclusion_count;
-			/* Userspace probe location size. */
-			uint32_t userspace_probe_location_len;
-			/*
-			 * After this structure, the following variable-length
-			 * items are transmitted:
-			 * - char exclusion_names[LTTNG_SYMBOL_NAME_LEN][exclusion_count]
-			 * - char filter_expression[expression_len]
-			 * - unsigned char filter_bytecode[bytecode_len]
-			 */
+			uint32_t length;
 		} LTTNG_PACKED enable;
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			struct lttng_event event LTTNG_PACKED;
-			/* Length of following filter expression. */
-			uint32_t expression_len;
-			/* Length of following bytecode for filter. */
-			uint32_t bytecode_len;
-			/*
-			 * After this structure, the following variable-length
-			 * items are transmitted:
-			 * - unsigned char filter_expression[expression_len]
-			 * - unsigned char filter_bytecode[bytecode_len]
-			 */
+			uint32_t length;
 		} LTTNG_PACKED disable;
 		/* Create channel */
 		struct {
-			struct lttng_channel chan LTTNG_PACKED;
-			/* struct lttng_channel_extended is already packed. */
-			struct lttng_channel_extended extended;
+			uint32_t length;
 		} LTTNG_PACKED channel;
 		/* Context */
 		struct {
@@ -446,11 +419,11 @@ struct lttng_event_exclusion {
 	(&(_exclusion)->names[_i][0])
 
 /*
- * Event command header.
+ * Listing command header.
  */
-struct lttcomm_event_command_header {
-	/* Number of events */
-	uint32_t nb_events;
+struct lttcomm_list_command_header {
+	/* Number of elements */
+	uint32_t count;
 } LTTNG_PACKED;
 
 /*