X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=c38ed37458c8899edea5ee4a0fe6b486c75a53df;hb=b4e3ceb9d379829bc5d6ec799f83086317aeafd8;hp=67d1bcfaf72e0677d1afd46e7e3e3604dea88d2b;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 67d1bcfaf..c38ed3745 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -6,12 +6,12 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
  * as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -218,8 +218,8 @@ struct lttcomm_proto_ops {
 	int (*listen) (struct lttcomm_sock *sock, int backlog);
 	ssize_t (*recvmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
 			int flags);
-	ssize_t (*sendmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
-			int flags);
+	ssize_t (*sendmsg) (struct lttcomm_sock *sock, const void *buf,
+			size_t len, int flags);
 };
 
 /*
@@ -270,6 +270,8 @@ struct lttcomm_session_msg {
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
 			struct lttng_event_context ctx LTTNG_PACKED;
+			uint32_t provider_name_len;
+			uint32_t context_name_len;
 		} LTTNG_PACKED context;
 		/* Use by register_consumer */
 		struct {
@@ -333,7 +335,30 @@ struct lttng_filter_bytecode {
 struct lttng_event_exclusion {
 	uint32_t count;
 	char padding[LTTNG_EVENT_EXCLUSION_PADDING];
-	char names[LTTNG_SYMBOL_NAME_LEN][0];
+	char names[0][LTTNG_SYMBOL_NAME_LEN];
+} LTTNG_PACKED;
+
+#define LTTNG_EVENT_EXCLUSION_NAME_AT(_exclusion, _i) \
+	(&(_exclusion)->names[_i][0])
+
+/*
+ * Event command header.
+ */
+struct lttcomm_event_command_header {
+	/* Number of events */
+	uint32_t nb_events;
+} LTTNG_PACKED;
+
+/*
+ * Event extended info header. This is the structure preceding each
+ * extended info data.
+ */
+struct lttcomm_event_extended_header {
+	/*
+	 * Size of filter string immediately following this header.
+	 * This size includes the terminal null character.
+	 */
+	uint32_t filter_len;
 } LTTNG_PACKED;
 
 /*
@@ -343,9 +368,8 @@ struct lttcomm_lttng_msg {
 	uint32_t cmd_type;	/* enum lttcomm_sessiond_command */
 	uint32_t ret_code;	/* enum lttcomm_return_code */
 	uint32_t pid;		/* pid_t */
+	uint32_t cmd_header_size;
 	uint32_t data_size;
-	/* Contains: trace_name + data */
-	char payload[];
 } LTTNG_PACKED;
 
 struct lttcomm_lttng_output_id {