X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=b9bbb39bbbeeea702d045e818096b5a188960417;hb=13436238c6418c33e4eb3c3ab8e2a466f1597fd2;hp=ba800900e1011fc8121723f08b8b2e3a0972fae6;hpb=ff0f57289ff0e6be25424081fabbbfc0e3b1b565;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index ba800900..b9bbb39b 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -31,6 +31,7 @@
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
+#include <config.h>
 
 /*
  * Default timeout the application waits for the sessiond to send its
@@ -40,7 +41,7 @@
  */
 #define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
 
-#define LTTNG_DEFAULT_RUNDIR				"/var/run/lttng"
+#define LTTNG_DEFAULT_RUNDIR				LTTNG_SYSTEM_RUNDIR
 #define LTTNG_DEFAULT_HOME_RUNDIR			".lttng"
 
 /* Queue size of listen(2) */
@@ -48,6 +49,7 @@
 #define LTTNG_UST_COMM_REG_MSG_PADDING			64
 
 struct lttng_event_field;
+struct lttng_ctx_field;
 
 struct ustctl_reg_msg {
 	uint32_t magic;
@@ -89,6 +91,9 @@ struct ustcomm_ust_msg {
 			uint32_t reloc_offset;
 			uint64_t seqnum;
 		} LTTNG_PACKED filter;
+		struct {
+			uint32_t count;	/* how many names follow */
+		} LTTNG_PACKED exclusion;
 		char padding[USTCOMM_MSG_PADDING2];
 	} u;
 } LTTNG_PACKED;
@@ -102,7 +107,7 @@ struct ustcomm_ust_msg {
 struct ustcomm_ust_reply {
 	uint32_t handle;
 	uint32_t cmd;
-	uint32_t ret_code;	/* enum ustcomm_return_code */
+	int32_t ret_code;	/* enum ustcomm_return_code */
 	uint32_t ret_val;	/* return value */
 	char padding[USTCOMM_REPLY_PADDING1];
 	union {
@@ -226,7 +231,7 @@ int ustcomm_register_channel(int sock,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	size_t nr_ctx_fields,
-	const struct lttng_event_field *ctx_fields,
+	const struct lttng_ctx_field *ctx_fields,
 	uint32_t *chan_id,		/* channel id (output) */
 	int *header_type); 		/* header type (output) */