X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=4dd5731221e929f2f1e94984ce17826327797866;hb=f50f23d9f80ed9fae7fe5c49aee65e813e0031c8;hp=b94d3fb8d6229300fea7fda8203e4dda1b7fe27d;hpb=6d805429e9cb049eb0c9205fcf742a53e3166caf;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index b94d3fb8d..4dd573122 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>
@@ -52,44 +53,44 @@
 
 enum lttcomm_sessiond_command {
 	/* Tracer command */
-	LTTNG_ADD_CONTEXT,
-	LTTNG_CALIBRATE,
-	LTTNG_DISABLE_CHANNEL,
-	LTTNG_DISABLE_EVENT,
-	LTTNG_DISABLE_ALL_EVENT,
-	LTTNG_ENABLE_CHANNEL,
-	LTTNG_ENABLE_EVENT,
-	LTTNG_ENABLE_ALL_EVENT,
+	LTTNG_ADD_CONTEXT					= 1,
+	LTTNG_CALIBRATE						= 2,
+	LTTNG_DISABLE_CHANNEL				= 3,
+	LTTNG_DISABLE_EVENT					= 4,
+	LTTNG_DISABLE_ALL_EVENT				= 5,
+	LTTNG_ENABLE_CHANNEL				= 6,
+	LTTNG_ENABLE_EVENT					= 7,
+	LTTNG_ENABLE_ALL_EVENT				= 8,
 	/* Session daemon command */
-	LTTNG_CREATE_SESSION,
-	LTTNG_DESTROY_SESSION,
-	LTTNG_LIST_CHANNELS,
-	LTTNG_LIST_DOMAINS,
-	LTTNG_LIST_EVENTS,
-	LTTNG_LIST_SESSIONS,
-	LTTNG_LIST_TRACEPOINTS,
-	LTTNG_REGISTER_CONSUMER,
-	LTTNG_START_TRACE,
-	LTTNG_STOP_TRACE,
-	LTTNG_LIST_TRACEPOINT_FIELDS,
+	LTTNG_CREATE_SESSION				= 9,
+	LTTNG_DESTROY_SESSION				= 10,
+	LTTNG_LIST_CHANNELS                 = 11,
+	LTTNG_LIST_DOMAINS                  = 12,
+	LTTNG_LIST_EVENTS                   = 13,
+	LTTNG_LIST_SESSIONS                 = 14,
+	LTTNG_LIST_TRACEPOINTS              = 15,
+	LTTNG_REGISTER_CONSUMER             = 16,
+	LTTNG_START_TRACE                   = 17,
+	LTTNG_STOP_TRACE                    = 18,
+	LTTNG_LIST_TRACEPOINT_FIELDS        = 19,
 
 	/* Consumer */
-	LTTNG_DISABLE_CONSUMER,
-	LTTNG_ENABLE_CONSUMER,
-	LTTNG_SET_CONSUMER_URI,
+	LTTNG_DISABLE_CONSUMER              = 20,
+	LTTNG_ENABLE_CONSUMER               = 21,
+	LTTNG_SET_CONSUMER_URI              = 22,
 	/* Relay daemon */
-	RELAYD_ADD_STREAM,
-	RELAYD_CREATE_SESSION,
-	RELAYD_START_DATA,
-	RELAYD_UPDATE_SYNC_INFO,
-	RELAYD_VERSION,
-	RELAYD_SEND_METADATA,
-	RELAYD_CLOSE_STREAM,
-	RELAYD_DATA_PENDING,
-	RELAYD_QUIESCENT_CONTROL,
-	LTTNG_SET_FILTER,
-	LTTNG_HEALTH_CHECK,
-	LTTNG_DATA_PENDING,
+	RELAYD_ADD_STREAM                   = 23,
+	RELAYD_CREATE_SESSION               = 24,
+	RELAYD_START_DATA                   = 25,
+	RELAYD_UPDATE_SYNC_INFO             = 26,
+	RELAYD_VERSION                      = 27,
+	RELAYD_SEND_METADATA                = 28,
+	RELAYD_CLOSE_STREAM                 = 29,
+	RELAYD_DATA_PENDING                 = 30,
+	RELAYD_QUIESCENT_CONTROL            = 31,
+	LTTNG_ENABLE_EVENT_WITH_FILTER      = 32,
+	LTTNG_HEALTH_CHECK                  = 33,
+	LTTNG_DATA_PENDING                  = 34,
 };
 
 /*
@@ -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;
 };
 
@@ -218,9 +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];
 };
 
@@ -274,7 +273,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 {
@@ -292,6 +291,13 @@ struct lttcomm_consumer_msg {
 	} u;
 };
 
+/*
+ * Status message returned to the sessiond after a received command.
+ */
+struct lttcomm_consumer_status_msg {
+	enum lttng_error_code ret_code;
+};
+
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
 #include <lttng/ust-abi.h>