-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
- { \
- .name = #_item, \
- .type = __type_integer(_type, _byte_order, _base, none),\
- .nowrite = _nowrite, \
- },
-
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
- { \
- .name = #_item, \
- .type = __type_float(_type), \
- .nowrite = _nowrite, \
- },
-
-#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
- { \
- .name = #_item, \
- .type = \
- { \
- .atype = atype_array, \
- .u = \
- { \
- .array = \
- { \
- .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
- .length = _length, \
- } \
- } \
- }, \
- .nowrite = _nowrite, \
- },
-
-#undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+ LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
+ .struct_size = sizeof(struct lttng_ust_event_field), \
+ .name = #_item, \
+ .type = lttng_ust_type_integer_define(_type, _byte_order, _base), \
+ .nowrite = _nowrite, \
+ .nofilter = 0, \
+ }),
+
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
+ LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
+ .struct_size = sizeof(struct lttng_ust_event_field), \
+ .name = #_item, \
+ .type = lttng_ust_type_float_define(_type), \
+ .nowrite = _nowrite, \
+ .nofilter = 0, \
+ }),
+
+#undef lttng_ust__field_array_encoded
+#define lttng_ust__field_array_encoded(_type, _item, _src, _byte_order, \
+ _length, _encoding, _nowrite, \
+ _elem_type_base) \
+ LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
+ .struct_size = sizeof(struct lttng_ust_event_field), \
+ .name = #_item, \
+ .type = (const struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_type_array, { \
+ .parent = { \
+ .type = lttng_ust_type_array, \
+ }, \
+ .struct_size = sizeof(struct lttng_ust_type_array), \
+ .elem_type = lttng_ust_type_integer_define(_type, _byte_order, _elem_type_base), \
+ .length = _length, \
+ .alignment = 0, \
+ .encoding = lttng_ust_string_encoding_##_encoding, \
+ }), \
+ .nowrite = _nowrite, \
+ .nofilter = 0, \
+ }),
+
+#undef lttng_ust__field_sequence_encoded
+#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, \