X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=7090673dc4f6f846916067a23280f61c7711edd7;hb=b62f8205216d20d7ef16b536efd81389dc6fdd2f;hp=96504940ec3669941dff17ec0a7753d45f230ddd;hpb=07539b344734a4da4e6010a82acf90b47dbecebd;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 96504940..7090673d 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,8 +124,8 @@ struct lttng_ust_type_integer {
 		},							\
 		.struct_size = sizeof(struct lttng_ust_type_integer),	\
 		.size = sizeof(_type) * CHAR_BIT,			\
-		.alignment = lttng_alignof(_type) * CHAR_BIT,		\
-		.signedness = lttng_is_signed_type(_type),		\
+		.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,	\
 	}))
 
@@ -258,7 +259,8 @@ struct lttng_ust_event_field {
 struct lttng_ust_event_desc {
 	uint32_t struct_size;			/* Size of this structure. */
 
-	const char *name;
+	const char *event_name;
+	struct lttng_ust_probe_desc *probe_desc;
 	void (*probe_callback)(void);
 	struct lttng_event_ctx *ctx;		/* context */
 	struct lttng_ust_event_field **fields;	/* event payload */
@@ -282,7 +284,7 @@ struct lttng_ust_event_desc {
 struct lttng_ust_probe_desc {
 	uint32_t struct_size;			/* Size of this structure. */
 
-	const char *provider;
+	const char *provider_name;
 	struct lttng_ust_event_desc **event_desc;
 	unsigned int nr_events;
 	struct cds_list_head head;		/* chain registered probes */