X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=cf1045bb589470d5a1f53f13369b14fb5c5e987c;hb=34f7f1421e4869381acf65d59cb1abb37df440df;hp=95b4698de089bb08440687bbcb226f7ca461bcd2;hpb=cda77256e7f0cbc8839f9c872b75e77cb1fb7d5c;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 95b4698d..cf1045bb 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -37,7 +37,7 @@ extern "C" {
 
 struct lttng_ust_channel_buffer;
 struct lttng_ust_session;
-struct lttng_ust_lib_ring_buffer_ctx;
+struct lttng_ust_ring_buffer_ctx;
 struct lttng_ust_event_field;
 struct lttng_ust_registered_probe;
 
@@ -117,7 +117,7 @@ struct lttng_ust_type_integer {
 };
 
 #define lttng_ust_type_integer_define(_type, _byte_order, _base)	\
-	((struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_integer, { \
+	((struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(struct lttng_ust_type_integer, { \
 		.parent = {						\
 			.type = lttng_ust_type_integer,			\
 		},							\
@@ -148,7 +148,7 @@ struct lttng_ust_type_float {
 		: 0))
 
 #define lttng_ust_type_float_define(_type)				\
-	((struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_float, { \
+	((struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(struct lttng_ust_type_float, { \
 		.parent = {						\
 			.type = lttng_ust_type_float,			\
 		},							\
@@ -203,8 +203,8 @@ struct lttng_ust_type_struct {
 	struct lttng_ust_type_common parent;
 	uint32_t struct_size;
 	unsigned int nr_fields;
-	const struct lttng_ust_event_field **fields;	/* Array of pointers to fields. */
-	unsigned int alignment;		/* Minimum alignment for this type. */
+	const struct lttng_ust_event_field * const *fields;	/* Array of pointers to fields. */
+	unsigned int alignment;					/* Minimum alignment for this type. */
 };
 
 /*
@@ -223,7 +223,7 @@ struct lttng_ust_enum_desc {
 	uint32_t struct_size;
 
 	const char *name;
-	const struct lttng_ust_enum_entry **entries;
+	const struct lttng_ust_enum_entry * const *entries;
 	unsigned int nr_entries;
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
@@ -268,7 +268,7 @@ struct lttng_ust_event_desc {
 	const char *event_name;
 	const struct lttng_ust_probe_desc *probe_desc;
 	void (*probe_callback)(void);
-	const struct lttng_ust_event_field **fields;	/* event payload */
+	const struct lttng_ust_event_field * const *fields;	/* event payload */
 	unsigned int nr_fields;
 	const int **loglevel;
 	const char *signature;				/* Argument types/names received */
@@ -290,7 +290,7 @@ struct lttng_ust_probe_desc {
 	uint32_t struct_size;			/* Size of this structure. */
 
 	const char *provider_name;
-	const struct lttng_ust_event_desc **event_desc;
+	const struct lttng_ust_event_desc * const *event_desc;
 	unsigned int nr_events;
 	uint32_t major;
 	uint32_t minor;
@@ -429,7 +429,7 @@ struct lttng_ust_event_notifier {
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-struct lttng_ust_lib_ring_buffer_channel;
+struct lttng_ust_ring_buffer_channel;
 struct lttng_ust_channel_buffer_ops_private;
 
 /*
@@ -446,13 +446,13 @@ 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);
-	void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
-	void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+	int (*event_reserve)(struct lttng_ust_ring_buffer_ctx *ctx);
+	void (*event_commit)(struct lttng_ust_ring_buffer_ctx *ctx);
+	void (*event_write)(struct lttng_ust_ring_buffer_ctx *ctx,
 			const void *src, size_t len, size_t alignment);
-	void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+	void (*event_strcpy)(struct lttng_ust_ring_buffer_ctx *ctx,
 			const char *src, size_t len);
-	void (*event_pstrcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+	void (*event_pstrcpy_pad)(struct lttng_ust_ring_buffer_ctx *ctx,
 			const char *src, size_t len);
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */