X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=baf608ffd748fd3036e52547d850ccb84c66be98;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hp=bae083dd83018e002afa36e2b648f586fca9bac1;hpb=e462382a6b803ff2e8f269c4361e095fc1827733;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index bae083dd8..baf608ffd 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -60,10 +60,10 @@ enum lttcomm_sessiond_command {
 	LTTNG_CALIBRATE                     = 1,
 	LTTNG_DISABLE_CHANNEL               = 2,
 	LTTNG_DISABLE_EVENT                 = 3,
-	LTTNG_DISABLE_ALL_EVENT             = 4,
+	LTTNG_LIST_SYSCALLS                 = 4,
 	LTTNG_ENABLE_CHANNEL                = 5,
 	LTTNG_ENABLE_EVENT                  = 6,
-	LTTNG_ENABLE_ALL_EVENT              = 7,
+	/* 7 */
 	/* Session daemon command */
 	LTTNG_CREATE_SESSION                = 8,
 	LTTNG_DESTROY_SESSION               = 9,
@@ -91,6 +91,9 @@ enum lttcomm_sessiond_command {
 	LTTNG_CREATE_SESSION_SNAPSHOT       = 29,
 	LTTNG_CREATE_SESSION_LIVE           = 30,
 	LTTNG_SAVE_SESSION                  = 31,
+
+	/* Session daemon commands (cont.) */
+	LTTNG_SET_SESSION_SHM_PATH          = 40,
 };
 
 enum lttcomm_relayd_command {
@@ -227,10 +230,6 @@ struct lttcomm_session_msg {
 	struct lttng_session session;
 	struct lttng_domain domain;
 	union {
-		struct {
-			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			char name[NAME_MAX];
-		} LTTNG_PACKED disable;
 		/* Event data */
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
@@ -249,6 +248,20 @@ struct lttcomm_session_msg {
 			 * - unsigned char filter_bytecode[bytecode_len]
 			 */
 		} 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]
+			 */
+		} LTTNG_PACKED disable;
 		/* Create channel */
 		struct {
 			struct lttng_channel chan LTTNG_PACKED;
@@ -286,6 +299,9 @@ struct lttcomm_session_msg {
 		struct {
 			struct lttng_save_session_attr attr; /* struct already packed */
 		} LTTNG_PACKED save_session;
+		struct {
+			char shm_path[PATH_MAX];
+		} LTTNG_PACKED set_shm_path;
 	} u;
 } LTTNG_PACKED;
 
@@ -414,6 +430,7 @@ struct lttcomm_consumer_msg {
 			 * because the application can be in the tracing for instance.
 			 */
 			uint32_t ust_app_uid;
+			char shm_path[PATH_MAX];
 		} LTTNG_PACKED ask_channel;
 		struct {
 			uint64_t key;
@@ -442,7 +459,7 @@ struct lttcomm_consumer_msg {
 			uint32_t metadata;		/* This a metadata snapshot. */
 			uint64_t relayd_id;		/* Relayd id if apply. */
 			uint64_t key;
-			uint64_t max_stream_size;
+			uint64_t nb_packets_per_stream;
 		} LTTNG_PACKED snapshot_channel;
 		struct {
 			uint64_t channel_key;