X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=108e7752e5530bd585fcac0a3b1cf32743b210b1;hb=8936b6c0add7eb6706e0a1ca50e03c446dda4006;hp=e8e4bf2cac12d254bd11ae884847c2f4367bcf64;hpb=a2e4d05e924d4cb02b47430c2d0f39e6a6a89720;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index e8e4bf2c..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,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 */
@@ -375,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. */
@@ -428,7 +429,7 @@ struct lttng_ust_event_notifier {
 };
 
 struct lttng_ust_lib_ring_buffer_channel;
-struct lttng_ust_channel_ops_private;
+struct lttng_ust_channel_buffer_ops_private;
 
 /*
  * IMPORTANT: this structure is part of the ABI between the probe and
@@ -439,18 +440,19 @@ struct lttng_ust_channel_ops_private;
  * structure. It should be queried before using additional fields added
  * at the end of the structure.
  */
-struct lttng_ust_channel_ops {
+struct lttng_ust_channel_buffer_ops {
 	uint32_t struct_size;
 
-	struct lttng_ust_channel_ops_private *priv;	/* Private channel ops interface */
+	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,
+			const char *src, size_t len);
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
@@ -501,9 +503,7 @@ struct lttng_ust_channel_buffer {
 	struct lttng_ust_channel_common *parent;	/* Inheritance by aggregation. */
 	struct lttng_ust_channel_buffer_private *priv;	/* Private channel buffer interface */
 
-	struct lttng_ust_channel_ops *ops;
-	struct lttng_ust_lib_ring_buffer_channel *chan;	/* Channel buffers */
-	struct lttng_ust_shm_handle *handle;		/* shared-memory handle */
+	struct lttng_ust_channel_buffer_ops *ops;
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };