X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.h;h=6cc3753101fb1606de8f1c11fe1f81c504c7553b;hb=1c726b25f42c14020fbafdaa5cbb2c3eb1644b53;hp=d07f1c879d2d44e4a1fa76cf6da372e723d7b527;hpb=aa7c23a91f7af01415106af98b96a2a1871e97b0;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index d07f1c87..6cc37531 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -45,17 +45,17 @@ struct lttng_enum_entry {
 	const char *string;
 };
 
-#define __type_integer(_type, _byte_order, _base)		\
+#define __type_integer(_type, _byte_order, _base, _encoding)	\
 	{							\
 	    .atype = atype_integer,				\
 	    .u.basic.integer =					\
 		{						\
-		  .size = sizeof(_type),			\
+		  .size = sizeof(_type) * CHAR_BIT,		\
 		  .alignment = ltt_alignof(_type) * CHAR_BIT,	\
 		  .signedness = is_signed_type(_type),		\
 		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
 		  .base = _base,				\
-		  .encoding = lttng_encode_none,		\
+		  .encoding = lttng_encode_##_encoding,		\
 		},						\
 	}							\
 
@@ -180,7 +180,8 @@ struct ltt_channel_ops {
 	void (*channel_destroy)(struct channel *chan);
 	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);
+	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
+			     uint32_t event_id);
 	void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
 	void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
 			    size_t len);
@@ -244,7 +245,6 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 				       unsigned int read_timer_interval);
 
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
-				   char *name,
 				   struct lttng_kernel_event *event_param,
 				   void *filter);