X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust-comm.h;h=4dbd5c8999d00f49495a6841951a63500df68d86;hb=76644b7eab2612bb24ce3dc6d67d5a654c4b7f8f;hp=c9c8ca419f6a4aaffd4cf30d2834820b6b55c58a;hpb=d8d2416dab454962b90222ba46c82cdce0c666a4;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index c9c8ca41..4dbd5c89 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -33,6 +33,7 @@
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-ctl.h>
+#include "helper.h"
 
 #ifndef LTTNG_PACKED
 #error "LTTNG_PACKED should be defined"
@@ -88,7 +89,6 @@ struct ustcomm_ust_msg {
 	uint32_t cmd;
 	char padding[USTCOMM_MSG_PADDING1];
 	union {
-		struct lttng_ust_event_notifier event_notifier;
 		struct lttng_ust_channel channel;
 		struct lttng_ust_stream stream;
 		struct lttng_ust_event event;
@@ -103,6 +103,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,9 +237,17 @@ 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);
+LTTNG_HIDDEN
 ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
 		int *event_notifier_notif_fd);
 
+LTTNG_HIDDEN
+ssize_t ustcomm_recv_counter_from_sessiond(int sock,
+		void **counter_data, uint64_t len);
+LTTNG_HIDDEN
+int ustcomm_recv_counter_shm_from_sessiond(int sock,
+		int *shm_fd);
+
 /*
  * Returns 0 on success, negative error value on error.
  * Returns -EPIPE or -ECONNRESET if other end has hung up.