X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=1044bb0a7834a972771cd8c6cc4b792883c71fe3;hb=616d3093e1c34557aca7e9f6149338f43cf91886;hp=bf00f062482b154695e2579f7c0538537e55854c;hpb=0264ec6ce3555f2d14d609f32cfd9abc2117fa57;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index bf00f062..1044bb0a 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -21,13 +21,14 @@
 
 #include <urcu/list.h>
 #include <urcu/hlist.h>
-#include <uuid/uuid.h>
 #include <stdint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
-#include <endian.h>
+#include <lttng/ust-endian.h>
 #include <float.h>
 
+#define LTTNG_UST_UUID_LEN		16
+
 struct ltt_channel;
 struct ltt_session;
 struct lttng_ust_lib_ring_buffer_ctx;
@@ -84,7 +85,7 @@ struct lttng_enum_entry {
 		  .size = sizeof(_type) * CHAR_BIT,		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
 		  .signedness = lttng_is_signed_type(_type),	\
-		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
+		  .reverse_byte_order = _byte_order != BYTE_ORDER,	\
 		  .base = _base,				\
 		  .encoding = lttng_encode_##_encoding,		\
 		},						\
@@ -119,7 +120,7 @@ struct lttng_integer_type {
 				- _float_mant_dig(_type),	\
 		  .mant_dig = _float_mant_dig(_type),		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
-		  .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \
+		  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
 		},						\
 	}							\
 
@@ -302,13 +303,15 @@ struct ltt_channel_ops {
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval,
-				int **shm_fd, int **wait_fd,
+				int **shm_fd, char **shm_path,
+                                int **wait_fd, char **wait_pipe_path,
 				uint64_t **memory_map_size,
 				struct ltt_channel *chan_priv_init);
 	void (*channel_destroy)(struct ltt_channel *ltt_chan);
 	struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
 				struct lttng_ust_shm_handle *handle,
-				int **shm_fd, int **wait_fd,
+                                int **shm_fd, char **shm_path,
+				int **wait_fd, char **wait_pipe_path,
 				uint64_t **memory_map_size);
 	void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf,
 				struct lttng_ust_shm_handle *handle);
@@ -329,6 +332,7 @@ struct ltt_channel_ops {
 	int (*is_finalized)(struct channel *chan);
 	int (*is_disabled)(struct channel *chan);
 	int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
+	int (*channel_open_pipe)(struct channel *chan, struct lttng_ust_shm_handle *handle);
 };
 
 struct ltt_channel {
@@ -355,7 +359,7 @@ struct ltt_channel {
 	/* Channel ID, available for consumer too */
 	unsigned int id;
 	/* Copy of session UUID for consumer (availability through shm) */
-	uuid_t uuid;			/* Trace session unique ID */
+	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 };
 
 struct ltt_session {
@@ -368,7 +372,7 @@ struct ltt_session {
 	struct cds_list_head wildcards;	/* Wildcard list head */
 	struct cds_list_head list;	/* Session list */
 	unsigned int free_chan_id;	/* Next chan ID to allocate */
-	uuid_t uuid;			/* Trace session unique ID */
+	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 	unsigned int metadata_dumped:1;
 };
 
@@ -389,7 +393,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
 				       unsigned int read_timer_interval,
-				       int **shm_fd, int **wait_fd,
+				       int **shm_fd, char **shm_path,
+				       int **wait_fd, char **wait_pipe_path,
 				       uint64_t **memory_map_size,
 				       struct ltt_channel *chan_priv_init);
 struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
@@ -397,7 +402,8 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
 				       unsigned int read_timer_interval,
-				       int **shm_fd, int **wait_fd,
+				       int **shm_fd, char **shm_path,
+				       int **wait_fd, char **wait_pipe_path,
 				       uint64_t **memory_map_size);
 
 int ltt_event_create(struct ltt_channel *chan,