#include <lttng/ust-endian.h>
#include <lttng/ust-api-compat.h>
#include <string.h>
+#include <lttng/ust-api-compat.h>
-#define LTTNG_UST__NULL_STRING "(null)"
+#if LTTNG_UST_COMPAT_API(0)
+#define TP_FIELDS LTTNG_UST_TP_FIELDS
+
+#define ctf_integer lttng_ust_field_integer
+#define ctf_integer_hex lttng_ust_field_integer_hex
+#define ctf_integer_network lttng_ust_field_integer_network
+#define ctf_integer_network_hex lttng_ust_field_integer_network_hex
+#define ctf_integer_nowrite lttng_ust_field_integer_nowrite
+
+#define ctf_float lttng_ust_field_float
+#define ctf_float_nowrite lttng_ust_field_float_nowrite
+
+#define ctf_array lttng_ust_field_array
+#define ctf_array_hex lttng_ust_field_array_hex
+#define ctf_array_network lttng_ust_field_array_network
+#define ctf_array_network_hex lttng_ust_field_array_network_hex
+#define ctf_array_text lttng_ust_field_array_text
+#define ctf_array_nowrite lttng_ust_field_array_nowrite
+#define ctf_array_nowrite_hex lttng_ust_field_array_nowrite_hex
+#define ctf_array_network_nowrite lttng_ust_field_array_network_nowrite
+#define ctf_array_network_nowrite_hex lttng_ust_field_array_network_nowrite_hex
+#define ctf_array_text_nowrite lttng_ust_field_array_text_nowrite
+
+#define ctf_sequence lttng_ust_field_sequence
+#define ctf_sequence_hex lttng_ust_field_sequence_hex
+#define ctf_sequence_network lttng_ust_field_sequence_network
+#define ctf_sequence_network_hex lttng_ust_field_sequence_network_hex
+#define ctf_sequence_text lttng_ust_field_sequence_text
+#define ctf_sequence_nowrite lttng_ust_field_sequence_nowrite
+#define ctf_sequence_nowrite_hex lttng_ust_field_sequence_nowrite_hex
+#define ctf_sequence_network_nowrite lttng_ust_field_sequence_network_nowrite
+#define ctf_sequence_network_nowrite_hex lttng_ust_field_sequence_network_nowrite_hex
+#define ctf_sequence_text_nowrite lttng_ust_field_sequence_text_nowrite
+
+#define ctf_string lttng_ust_field_string
+#define ctf_string_nowrite lttng_ust_field_string_nowrite
+
+#define ctf_unused lttng_ust_field_unused
+#define ctf_unused_nowrite lttng_ust_field_unused_nowrite
+
+#define ctf_enum lttng_ust_field_enum
+#define ctf_enum_nowrite lttng_ust_field_enum_nowrite
+#define ctf_enum_value lttng_ust_field_enum_value
+#define ctf_enum_range lttng_ust_field_enum_range
+#define ctf_enum_auto lttng_ust_field_enum_auto
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
-#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))
+#define LTTNG_UST__NULL_STRING "(null)"
/*
* LTTNG_UST_TRACEPOINT_EVENT_CLASS declares a class of tracepoints receiving the
#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 = { \
}),
/* 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 = { \
}),
/* 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 = { \
#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
.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, \
__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
__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
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
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 */