X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Fust-comm.h;h=c59003687e64601c565d86f738d82e0962a3ba45;hb=9f47aac89a87197f5f1ea18acdc160087ac58397;hp=a5e0957235ff2503e73ec8f8dfd3f17356e05735;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index a5e09572..c5900368 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -33,7 +33,6 @@
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-ctl.h>
-#include <config.h>
 
 #ifndef LTTNG_PACKED
 #error "LTTNG_PACKED should be defined"
@@ -103,6 +102,23 @@ struct ustcomm_ust_msg {
 		struct {
 			uint32_t count;	/* how many names follow */
 		} LTTNG_PACKED exclusion;
+		struct {
+			uint32_t data_size;	/* following capture data */
+			uint32_t reloc_offset;
+			uint64_t seqnum;
+		} LTTNG_PACKED capture;
+		struct lttng_ust_counter counter;
+		struct lttng_ust_counter_global counter_global;
+		struct lttng_ust_counter_cpu counter_cpu;
+		/*
+		 * For LTTNG_UST_EVENT_NOTIFIER_CREATE, a struct
+		 * lttng_ust_event_notifier implicitly follows struct
+		 * ustcomm_ust_msg.
+		 */
+		struct {
+			/* Length of struct lttng_ust_event_notifier */
+			uint32_t len;
+		} event_notifier;
 		char padding[USTCOMM_MSG_PADDING2];
 	} u;
 } LTTNG_PACKED;
@@ -220,6 +236,13 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock,
 int ustcomm_recv_stream_from_sessiond(int sock,
 		uint64_t *memory_map_size,
 		int *shm_fd, int *wakeup_fd);
+ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
+		int *event_notifier_notif_fd);
+
+ssize_t ustcomm_recv_counter_from_sessiond(int sock,
+		void **counter_data, uint64_t len);
+int ustcomm_recv_counter_shm_from_sessiond(int sock,
+		int *shm_fd);
 
 /*
  * Returns 0 on success, negative error value on error.