X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevents.h;h=338573a9947373bbce5ef07b7d0ff4e639155273;hb=9a1d0634d1a6a7e205ad5e2da05fcfeb0f32ccee;hp=b3e11bb383d946d97fe5620fe48b26f369408e39;hpb=36c52fffa1beb46c7c15bb6ac4a4179cae373b98;p=lttng-ust.git

diff --git a/src/common/events.h b/src/common/events.h
index b3e11bb3..338573a9 100644
--- a/src/common/events.h
+++ b/src/common/events.h
@@ -253,7 +253,7 @@ struct lttng_transport {
 	const char *name;
 	struct cds_list_head node;
 	struct lttng_ust_channel_buffer_ops ops;
-	const struct lttng_ust_lib_ring_buffer_config *client_config;
+	const struct lttng_ust_ring_buffer_config *client_config;
 };
 
 struct lttng_counter_transport {
@@ -305,6 +305,7 @@ struct lttng_ust_bytecode_runtime {
 	int link_failed;
 	int (*interpreter_func)(struct lttng_ust_bytecode_runtime *bytecode_runtime,
 			const char *interpreter_stack_data,
+			struct lttng_ust_probe_ctx *probe_ctx,
 			void *ctx);
 	struct cds_list_head node;		/* list of bytecode runtime in event */
 	/*
@@ -389,7 +390,7 @@ struct lttng_ust_channel_buffer_private {
 	unsigned int id;			/* Channel ID */
 	enum lttng_ust_abi_chan_type type;
 	struct lttng_ust_ctx *ctx;
-	struct lttng_ust_lib_ring_buffer_channel *rb_chan;	/* Ring buffer channel */
+	struct lttng_ust_ring_buffer_channel *rb_chan;	/* Ring buffer channel */
 	unsigned char uuid[LTTNG_UST_UUID_LEN];	/* Trace session unique ID */
 };
 
@@ -407,10 +408,13 @@ struct lttng_ust_abi_channel_config {
 	void *unused3;
 	void *unused4;
 	int unused5;
+	unsigned int _deprecated1;
+	unsigned int _deprecated2;
 	struct cds_list_head unused6;
 	void *unused7;
 	int unused8;
 	void *unused9;
+	unsigned int _deprecated3:1;
 
 	/* Channel ID */
 	unsigned int id;
@@ -441,10 +445,13 @@ struct lttng_ust_registered_probe {
 
 struct lttng_ust_ctx_field {
 	const struct lttng_ust_event_field *event_field;
-	size_t (*get_size)(void *priv, size_t offset);
-	void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		       struct lttng_ust_channel_buffer *chan);
-	void (*get_value)(void *priv, struct lttng_ust_ctx_value *value);
+	size_t (*get_size)(void *priv, struct lttng_ust_probe_ctx *probe_ctx,
+			size_t offset);
+	void (*record)(void *priv, struct lttng_ust_probe_ctx *probe_ctx,
+			struct lttng_ust_ring_buffer_ctx *ctx,
+			struct lttng_ust_channel_buffer *chan);
+	void (*get_value)(void *priv, struct lttng_ust_probe_ctx *probe_ctx,
+			struct lttng_ust_ctx_value *value);
 	void (*destroy)(void *priv);
 	void *priv;
 };
@@ -506,7 +513,7 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
 }
 
 #define lttng_ust_static_type_integer(_size, _alignment, _signedness, _byte_order, _base)		\
-	((const struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_ust_type_integer, { \
+	((const struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_type_integer, { \
 		.parent = {										\
 			.type = lttng_ust_type_integer,							\
 		},											\
@@ -514,12 +521,12 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
 		.size = (_size),									\
 		.alignment = (_alignment),								\
 		.signedness = (_signedness),								\
-		.reverse_byte_order = (_byte_order) != BYTE_ORDER,					\
+		.reverse_byte_order = (_byte_order) != LTTNG_UST_BYTE_ORDER,					\
 		.base = (_base),									\
 	}))
 
 #define lttng_ust_static_type_array_text(_length)							\
-	((const struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_ust_type_array, { \
+	((const struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_type_array, { \
 		.parent = {										\
 			.type = lttng_ust_type_array,							\
 		},											\
@@ -529,11 +536,11 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
 		.encoding = lttng_ust_string_encoding_UTF8,						\
 		.elem_type = lttng_ust_static_type_integer(sizeof(char) * CHAR_BIT,			\
 				lttng_ust_rb_alignof(char) * CHAR_BIT, lttng_ust_is_signed_type(char),	\
-				BYTE_ORDER, 10),							\
+				LTTNG_UST_BYTE_ORDER, 10),							\
 	}))
 
 #define lttng_ust_static_event_field(_name, _type, _nowrite, _nofilter)					\
-	__LTTNG_COMPOUND_LITERAL(const struct lttng_ust_event_field, {					\
+	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, {				\
 		.struct_size = sizeof(struct lttng_ust_event_field),					\
 		.name = (_name),									\
 		.type = (_type),									\
@@ -542,7 +549,7 @@ const struct lttng_ust_type_struct *lttng_ust_get_type_struct(const struct lttng
 	})
 
 #define lttng_ust_static_ctx_field(_event_field, _get_size, _record, _get_value, _destroy, _priv)	\
-	__LTTNG_COMPOUND_LITERAL(const struct lttng_ust_ctx_field, {					\
+	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_ctx_field, {				\
 		.event_field = (_event_field),								\
 		.get_size = (_get_size),								\
 		.record = (_record),									\
@@ -567,9 +574,6 @@ struct lttng_enabler *lttng_event_notifier_enabler_as_enabler(
 
 
 
-/* This is ABI between liblttng-ust and liblttng-ust-ctl */
-struct lttng_transport *lttng_ust_transport_find(const char *name);
-
 /* This is ABI between liblttng-ust and liblttng-ust-dl */
 void lttng_ust_dl_update(void *ip);