X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=991cf7017eeb4c85e43c0f294e9e538387765158;hp=5884fb8423006c3b1ad2474d2689625b5e6b7018;hb=025faf73cdb6942ebf437dc4c4f6631f0134b128;hpb=c8f59ee5fc11492ef472dc5cfd2fd2c4926b1787

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 5884fb842..991cf7017 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -30,6 +30,7 @@
 #include <lttng/lttng.h>
 #include <common/compat/socket.h>
 #include <common/uri.h>
+#include <common/defaults.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -85,11 +86,11 @@ enum lttcomm_sessiond_command {
 	RELAYD_VERSION,
 	RELAYD_SEND_METADATA,
 	RELAYD_CLOSE_STREAM,
-	RELAYD_DATA_AVAILABLE,
+	RELAYD_DATA_PENDING,
 	RELAYD_QUIESCENT_CONTROL,
-	LTTNG_SET_FILTER,
+	LTTNG_ENABLE_EVENT_WITH_FILTER,
 	LTTNG_HEALTH_CHECK,
-	LTTNG_DATA_AVAILABLE,
+	LTTNG_DATA_PENDING,
 };
 
 /*
@@ -177,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 {
@@ -185,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 */
@@ -202,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;
 };
 
@@ -221,6 +217,7 @@ struct lttcomm_session_msg {
 struct lttng_filter_bytecode {
 	uint32_t len;	/* len of data */
 	uint32_t reloc_table_offset;
+	uint64_t seqnum;
 	char data[0];
 };
 
@@ -274,7 +271,7 @@ struct lttcomm_consumer_msg {
 			char path_name[PATH_MAX];
 			int net_index;
 			unsigned int metadata_flag;
-			char name[LTTNG_SYMBOL_NAME_LEN];  /* Name string of the stream */
+			char name[DEFAULT_STREAM_NAME_LEN];  /* Name string of the stream */
 			uint64_t session_id;   /* Tracing session id of the stream */
 		} stream;
 		struct {
@@ -288,7 +285,7 @@ struct lttcomm_consumer_msg {
 		} destroy_relayd;
 		struct {
 			uint64_t session_id;
-		} data_available;
+		} data_pending;
 	} u;
 };