X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Fust%2Flttng-events.h;h=8f1c98d32eed261964cb9616aa072032a86c04ca;hb=3d249a072c981fd9a5f0fcd3d4787beab64561e3;hp=ff66bc47e8e7e61dbe8f35623bf30ab4abb8698e;hpb=20f1eee76014511d3bccda9d9ffd7856f8ecae16;p=lttng-ust.git

diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h
index ff66bc47..8f1c98d3 100644
--- a/include/ust/lttng-events.h
+++ b/include/ust/lttng-events.h
@@ -15,12 +15,10 @@
 #include <uuid/uuid.h>
 #include <stdint.h>
 #include <ust/lttng-ust-abi.h>
+#include <ust/lttng-tracer.h>
 #include <endian.h>
 #include <float.h>
 
-#undef is_signed_type
-#define is_signed_type(type)		(((type)(-1)) < 0)
-
 struct ltt_channel;
 struct ltt_session;
 struct lib_ring_buffer_ctx;
@@ -57,8 +55,8 @@ struct lttng_enum_entry {
 	    .u.basic.integer =					\
 		{						\
 		  .size = sizeof(_type) * CHAR_BIT,		\
-		  .alignment = ltt_alignof(_type) * CHAR_BIT,	\
-		  .signedness = is_signed_type(_type),		\
+		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
+		  .signedness = lttng_is_signed_type(_type),	\
 		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
 		  .base = _base,				\
 		  .encoding = lttng_encode_##_encoding,		\
@@ -88,8 +86,7 @@ struct lttng_integer_type {
 		  .exp_dig = sizeof(_type) * CHAR_BIT		\
 				- _float_mant_dig(_type),	\
 		  .mant_dig = _float_mant_dig(_type),		\
-		  .alignment = ltt_alignof(_type) * CHAR_BIT,	\
-		  .signedness = is_signed_type(_type),		\
+		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
 		  .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \
 		},						\
 	}							\
@@ -197,15 +194,16 @@ struct ltt_event {
 	int metadata_dumped:1;
 };
 
+struct channel;
+
 struct ltt_channel_ops {
-	struct channel *(*channel_create)(const char *name,
+	struct shm_handle *(*channel_create)(const char *name,
 				struct ltt_channel *ltt_chan,
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval,
-				int *shmid);
-	void (*channel_destroy)(struct channel *chan);
+				unsigned int read_timer_interval);
+	void (*channel_destroy)(struct shm_handle *handle);
 	struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
 	void (*buffer_read_close)(struct lib_ring_buffer *buf);
 	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
@@ -237,7 +235,7 @@ struct ltt_channel {
 	struct cds_list_head list;	/* Channel list */
 	struct ltt_channel_ops *ops;
 	int header_type;		/* 0: unset, 1: compact, 2: large */
-	int shmid;			/* shared memory ID */
+	struct shm_handle *handle;	/* shared-memory handle */
 	int metadata_dumped:1;
 };