X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event.h;h=1f57f98a0afbfe65766d73a399b81217afc8bb1f;hb=fa4bbfab3dc67d370ba307d98cb298da0d1bd36b;hp=8ddf89c4599bb15fd315bdef2b223bf62c95b85f;hpb=3202f63a4d5e599bf22d6711828614b58c7efcba;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 8ddf89c4..1f57f98a 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -20,12 +20,6 @@
 
 #define LTTNG_UST__NULL_STRING	"(null)"
 
-#undef tp_list_for_each_entry_rcu
-#define tp_list_for_each_entry_rcu(pos, head, member)	\
-	for (pos = cds_list_entry(lttng_ust_tp_rcu_dereference((head)->next), __typeof__(*pos), member);	\
-	     &pos->member != (head);					\
-	     pos = cds_list_entry(lttng_ust_tp_rcu_dereference(pos->member.next), __typeof__(*pos), member))
-
 /*
  * LTTNG_UST_TRACEPOINT_EVENT_CLASS declares a class of tracepoints receiving the
  * same arguments and having the same field layout.
@@ -146,8 +140,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG
 #include <lttng/ust-tracepoint-event-reset.h>
 
 /* Enumeration entry (single value) */
-#undef ctf_enum_value
-#define ctf_enum_value(_string, _value)					\
+#undef lttng_ust_field_enum_value
+#define lttng_ust_field_enum_value(_string, _value)					\
 	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_enum_entry, {	\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
@@ -164,8 +158,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG
 	}),
 
 /* Enumeration entry (range) */
-#undef ctf_enum_range
-#define ctf_enum_range(_string, _range_start, _range_end)		\
+#undef lttng_ust_field_enum_range
+#define lttng_ust_field_enum_range(_string, _range_start, _range_end)		\
 	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_enum_entry, {	\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
@@ -182,8 +176,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG
 	}),
 
 /* Enumeration entry (automatic value; follows the rules of CTF) */
-#undef ctf_enum_auto
-#define ctf_enum_auto(_string)						\
+#undef lttng_ust_field_enum_auto
+#define lttng_ust_field_enum_auto(_string)						\
 	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_enum_entry, {	\
 		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
@@ -211,7 +205,7 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG
 #define LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values)			\
 	const struct lttng_ust_enum_entry * const __enum_values__##_provider##_##_name[] = { \
 		_values							\
-		ctf_enum_value("", 0)	/* Dummy, 0-len array forbidden by C99. */ \
+		lttng_ust_field_enum_value("", 0)	/* Dummy, 0-len array forbidden by C99. */ \
 	};
 #include LTTNG_UST_TRACEPOINT_INCLUDE
 
@@ -343,11 +337,11 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG
 		.nofilter = 0,					\
 	}),
 
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite) \
 	LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
 		.struct_size = sizeof(struct lttng_ust_event_field), \
 		.name = #_item,					\
@@ -451,13 +445,13 @@ static void lttng_ust__event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_D
 	__event_len += __dynamic_len[__dynamic_len_idx++] =		       \
 		strlen((_src) ? (_src) : LTTNG_UST__NULL_STRING) + 1;
 
-#undef _ctf_unused
-#define _ctf_unused(_src)							\
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)							\
 	if (0)									\
 		(void) (_src);  /* Unused */
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)		\
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)		\
 	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
 
 #undef LTTNG_UST_TP_ARGS
@@ -620,13 +614,13 @@ size_t lttng_ust__event_get_size__##_provider##___##_name(			      \
 		__stack_data += sizeof(void *);				       \
 	}
 
-#undef _ctf_unused
-#define _ctf_unused(_src)							\
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)							\
 	if (0)									\
 		(void) (_src);
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)		\
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)		\
 	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
 
 #undef LTTNG_UST_TP_ARGS
@@ -695,13 +689,13 @@ void lttng_ust__event_prepare_interpreter_stack__##_provider##___##_name(char *_
 	if (0)									\
 		(void) (_src);	/* Unused */
 
-#undef _ctf_unused
-#define _ctf_unused(_src)							\
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)							\
 	if (0)									\
 		(void) (_src);	/* Unused */
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)		\
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)		\
 	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
 
 #undef LTTNG_UST_TP_ARGS
@@ -781,11 +775,11 @@ size_t lttng_ust__event_get_align__##_provider##___##_name(LTTNG_UST__TP_ARGS_PR
 			lttng_ust__get_dynamic_len(dest));			\
 	}
 
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)	\
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)	\
 	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
 
 /* Beware: this get len actually consumes the len value */