X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=108e7752e5530bd585fcac0a3b1cf32743b210b1;hb=5152f6df156d6ccb234965d1b3d26b167bd6b94e;hp=8b45cb7f89ac2e2088f0ad01f48201f52fb77b13;hpb=eae3c72949135b48639440468dc78ea1d5e937e9;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 8b45cb7f..108e7752 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <urcu/ref.h>
 #include <pthread.h>
+#include <limits.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,7 +124,7 @@ struct lttng_ust_type_integer {
 		},							\
 		.struct_size = sizeof(struct lttng_ust_type_integer),	\
 		.size = sizeof(_type) * CHAR_BIT,			\
-		.alignment = lttng_alignof(_type) * CHAR_BIT,		\
+		.alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,	\
 		.signedness = lttng_ust_is_signed_type(_type),		\
 		.reverse_byte_order = _byte_order != BYTE_ORDER,	\
 		.base = _base,						\
@@ -156,7 +157,7 @@ struct lttng_ust_type_float {
 		.exp_dig = sizeof(_type) * CHAR_BIT			\
 			- lttng_ust_float_mant_dig(_type),		\
 		.mant_dig = lttng_ust_float_mant_dig(_type),		\
-		.alignment = lttng_alignof(_type) * CHAR_BIT,		\
+		.alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,	\
 		.reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,	\
 	}))
 
@@ -376,7 +377,6 @@ struct lttng_ust_event_recorder {
 	struct lttng_ust_event_common *parent;		/* Inheritance by aggregation. */
 	struct lttng_ust_event_recorder_private *priv;	/* Private event record interface */
 
-	unsigned int id;
 	struct lttng_ust_channel_buffer *chan;
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
@@ -445,11 +445,10 @@ struct lttng_ust_channel_buffer_ops {
 
 	struct lttng_ust_channel_buffer_ops_private *priv;	/* Private channel buffer ops interface */
 
-	int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
-			     uint32_t event_id);
+	int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
 	void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
 	void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
-			const void *src, size_t len);
+			const void *src, size_t len, size_t alignment);
 	void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			const char *src, size_t len);
 	void (*event_pstrcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,