X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=6f75a11132bddb52462d74dc87a6e2d3cb41cbd8;hp=5c030a97ef94bb42c2a572856f22735ac12e8adf;hb=b6bbed5f19b7d7102a1461820adc7f54ca3857ee;hpb=f3f0db50cf3fbc658bb4ffaf79a7fb694ab05e1d

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 5c030a97e..6f75a1113 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -88,7 +88,7 @@ enum lttcomm_sessiond_command {
 	RELAYD_CLOSE_STREAM,
 	RELAYD_DATA_PENDING,
 	RELAYD_QUIESCENT_CONTROL,
-	LTTNG_SET_FILTER,
+	LTTNG_ENABLE_EVENT_WITH_FILTER,
 	LTTNG_HEALTH_CHECK,
 	LTTNG_DATA_PENDING,
 };
@@ -178,6 +178,8 @@ struct lttcomm_session_msg {
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
 			struct lttng_event event;
+			/* Length of following bytecode for filter. */
+			uint32_t bytecode_len;
 		} enable;
 		/* Create channel */
 		struct {
@@ -186,7 +188,6 @@ struct lttcomm_session_msg {
 		/* Context */
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			char event_name[LTTNG_SYMBOL_NAME_LEN];
 			struct lttng_event_context ctx;
 		} context;
 		/* Use by register_consumer */
@@ -203,12 +204,6 @@ struct lttcomm_session_msg {
 			/* Number of lttng_uri following */
 			uint32_t size;
 		} uri;
-		struct {
-			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			char event_name[LTTNG_SYMBOL_NAME_LEN];
-			/* Length of following bytecode */
-			uint32_t bytecode_len;
-		} filter;
 	} u;
 };
 
@@ -219,10 +214,12 @@ struct lttcomm_session_msg {
  * bytecode. It is made of tuples: (uint16_t, var. len. string). It
  * starts at reloc_table_offset.
  */
+#define LTTNG_FILTER_PADDING	32
 struct lttng_filter_bytecode {
 	uint32_t len;	/* len of data */
 	uint32_t reloc_table_offset;
 	uint64_t seqnum;
+	char padding[LTTNG_FILTER_PADDING];
 	char data[0];
 };