X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event.h;h=48a244883bdbbf3df70ba01f620a20f5c29833af;hb=3b8bedd809f1a5b56da5fc101a90b44263b0f473;hp=fcd5303170d29babaa4fb8f3972f9df8b9ad6b3e;hpb=5b4c6da4aa59719b613c612afc05aee91f4343a4;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index fcd53031..48a24488 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -151,14 +151,14 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 	__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, {		\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
-			.value = lttng_is_signed_type(__typeof__(_value)) ? \
+			.value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
 		},							\
 		.end = {						\
-			.value = lttng_is_signed_type(__typeof__(_value)) ? \
+			.value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
 		},							\
 		.string = (_string),					\
 	}),
@@ -169,14 +169,14 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 	__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, {		\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
-			.value = lttng_is_signed_type(__typeof__(_range_start)) ? \
+			.value = lttng_ust_is_signed_type(__typeof__(_range_start)) ? \
 				(long long) (_range_start) : (_range_start), \
-			.signedness = lttng_is_signed_type(__typeof__(_range_start)), \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_range_start)), \
 		},							\
 		.end = {						\
-			.value = lttng_is_signed_type(__typeof__(_range_end)) ? \
+			.value = lttng_ust_is_signed_type(__typeof__(_range_end)) ? \
 				(long long) (_range_end) : (_range_end), \
-			.signedness = lttng_is_signed_type(__typeof__(_range_end)), \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_range_end)), \
 		},							\
 		.string = (_string),					\
 	}),
@@ -224,13 +224,13 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
 #define _ctf_array_encoded(_type, _item, _src, _byte_order,	\
 			_length, _encoding, _nowrite,		\
 			_elem_type_base)			\
-	_lttng_array_element_type_is_supported(_type, _item)
+	lttng_ust_ctf_array_element_type_is_supported(_type, _item)
 
 #undef _ctf_sequence_encoded
 #define _ctf_sequence_encoded(_type, _item, _src, _byte_order,	\
 			_length_type, _src_length, _encoding, _nowrite, \
 			_elem_type_base)			\
-	_lttng_array_element_type_is_supported(_type, _item)
+	lttng_ust_ctf_array_element_type_is_supported(_type, _item)
 
 #undef TP_FIELDS
 #define TP_FIELDS(...) __VA_ARGS__	/* Only one used in this phase */
@@ -406,26 +406,26 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 
 #undef _ctf_integer_ext
 #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite)       \
-	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+	__event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
 	__event_len += sizeof(_type);
 
 #undef _ctf_float
 #define _ctf_float(_type, _item, _src, _nowrite)				 \
-	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+	__event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
 	__event_len += sizeof(_type);
 
 #undef _ctf_array_encoded
 #define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, _encoding,	 \
 			_nowrite, _elem_type_base)				 \
-	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+	__event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
 	__event_len += sizeof(_type) * (_length);
 
 #undef _ctf_sequence_encoded
 #define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type,	 \
 			_src_length, _encoding, _nowrite, _elem_type_base)	 \
-	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type));   \
+	__event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_alignof(_length_type));   \
 	__event_len += sizeof(_length_type);				       \
-	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+	__event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
 	__dynamic_len[__dynamic_len_idx] = (_src_length);		       \
 	__event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx];       \
 	__dynamic_len_idx++;
@@ -477,7 +477,7 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
 
 #undef _ctf_integer_ext
 #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite)     \
-	if (lttng_is_signed_type(_type)) {				       \
+	if (lttng_ust_is_signed_type(_type)) {				       \
 		int64_t __ctf_tmp_int64;				       \
 		switch (sizeof(_type)) {				       \
 		case 1:							       \
@@ -688,7 +688,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
 	{								\
 		_type __tmp = (_src);					\
-		lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
+		lttng_ust_lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
 		__chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
 	}
 
@@ -696,14 +696,14 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #define _ctf_float(_type, _item, _src, _nowrite)		        \
 	{								\
 		_type __tmp = (_src);					\
-		lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
+		lttng_ust_lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
 		__chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
 	}
 
 #undef _ctf_array_encoded
 #define _ctf_array_encoded(_type, _item, _src, _byte_order, _length,	\
 			_encoding, _nowrite, _elem_type_base)		\
-	lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type));	\
+	lttng_ust_lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type));	\
 	if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
 		__chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length)); \
 	else								\
@@ -714,10 +714,10 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 			_src_length, _encoding, _nowrite, _elem_type_base) \
 	{								\
 		_length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \
-		lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\
+		lttng_ust_lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\
 		__chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type));\
 	}								\
-	lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type));	\
+	lttng_ust_lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type));	\
 	if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
 		__chan->ops->event_write(&__ctx, _src,			\
 			sizeof(_type) * __get_dynamic_len(dest));	\
@@ -729,7 +729,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 	{									\
 		const char *__ctf_tmp_string =					\
 			((_src) ? (_src) : __LTTNG_UST_NULL_STRING);		\
-		lib_ring_buffer_align_ctx(&__ctx,				\
+		lttng_ust_lib_ring_buffer_align_ctx(&__ctx,				\
 			lttng_alignof(*__ctf_tmp_string));			\
 		__chan->ops->event_strcpy(&__ctx, __ctf_tmp_string,		\
 			__get_dynamic_len(dest));				\
@@ -852,7 +852,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 		memset(&__lttng_ctx, 0, sizeof(__lttng_ctx));		      \
 		__lttng_ctx.struct_size = sizeof(struct lttng_ust_stack_ctx); \
 		__lttng_ctx.event_recorder = __event_recorder;		      \
-		lib_ring_buffer_ctx_init(&__ctx, NULL, &__lttng_ctx, __event_len, __event_align); \
+		lttng_ust_lib_ring_buffer_ctx_init(&__ctx, NULL, &__lttng_ctx, __event_len, __event_align); \
 		__ctx.ip = _TP_IP_PARAM(TP_IP_PARAM);			      \
 		__ret = __chan->ops->event_reserve(&__ctx, __event_recorder->id); \
 		if (__ret < 0)						      \