X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fust-comm.h;h=ae53f158e83dc338ae09e43047ef8adda154a1fc;hb=f7e770b846eb5b661edc4f0f11d2ad4851fd45ba;hp=97141160fc32dd6babd9a8614cc6462db1b9a892;hpb=32ce85691c17b331072b1c0df96f69e8b388d134;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 97141160..ae53f158 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;
@@ -102,7 +104,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 {
@@ -185,7 +187,7 @@ extern int ustcomm_send_app_cmd(int sock,
 int ustcomm_recv_fd(int sock);
 
 ssize_t ustcomm_recv_channel_from_sessiond(int sock,
-		void **chan_data, uint64_t len);
+		void **chan_data, uint64_t len, int *wakeup_fd);
 int ustcomm_recv_stream_from_sessiond(int sock,
 		uint64_t *memory_map_size,
 		int *shm_fd, int *wakeup_fd);
@@ -226,8 +228,11 @@ 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) */
 
+int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
+int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
+
 #endif	/* _LTTNG_UST_COMM_H */