From 1d188af9688feee0ec4e34038113a0edccddd4ea Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 21 Apr 2021 16:56:54 -0400 Subject: [PATCH] Tracepoint API namespacing ctf_sequence The ABI bump gives us the opportunity to namespace all public symbols under the 'lttng_ust_' prefix. Namespace all API symbols and macros under 'lttng_ust_' / 'LTTNG_UST_' and add compat macros to keep compatibility with the previous API. Change-Id: I6c8596313ce806dd401d41b9b24e228aad39cfe5 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- doc/examples/demo/ust_tests_demo2.h | 4 +- .../hello-static-lib/ust_tests_hello.h | 4 +- include/lttng/tp/lttng-ust-tracef.h | 2 +- include/lttng/tp/lttng-ust-tracelog.h | 2 +- include/lttng/tracepoint.h | 15 ++++++- include/lttng/ust-tracepoint-event-nowrite.h | 30 ++++++------- include/lttng/ust-tracepoint-event-reset.h | 44 +++++++++---------- include/lttng/ust-tracepoint-event-write.h | 30 ++++++------- include/lttng/ust-tracepoint-event.h | 24 +++++----- src/lib/lttng-ust-dl/ust_dl.h | 2 +- .../lttng-ust/lttng-ust-statedump-provider.h | 2 +- src/lib/lttng-ust/ust_lib.h | 2 +- tests/compile/hello.cxx/ust_tests_hello.h | 4 +- tests/compile/hello/ust_tests_hello.h | 10 ++--- tests/compile/test-app-ctx/ust_tests_hello.h | 4 +- 15 files changed, 95 insertions(+), 84 deletions(-) diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h index 95c83446..1d17f740 100644 --- a/doc/examples/demo/ust_tests_demo2.h +++ b/doc/examples/demo/ust_tests_demo2.h @@ -25,9 +25,9 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo2, loop, lttng_ust_field_integer_network_hex(int, netintfieldhex, netint) lttng_ust_field_array(long, arrfield1, values, 3) lttng_ust_field_array_text(char, arrfield2, text, 10) - ctf_sequence(char, seqfield1, text, + lttng_ust_field_sequence(char, seqfield1, text, size_t, textlen) - ctf_sequence_text(char, seqfield2, text, + lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) ctf_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h index 80b9d3b8..08afecff 100644 --- a/doc/examples/hello-static-lib/ust_tests_hello.h +++ b/doc/examples/hello-static-lib/ust_tests_hello.h @@ -25,9 +25,9 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, lttng_ust_field_integer_network_hex(int, netintfieldhex, netint) lttng_ust_field_array(long, arrfield1, values, 3) lttng_ust_field_array_text(char, arrfield2, text, 10) - ctf_sequence(char, seqfield1, text, + lttng_ust_field_sequence(char, seqfield1, text, size_t, textlen) - ctf_sequence_text(char, seqfield2, text, + lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) ctf_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) diff --git a/include/lttng/tp/lttng-ust-tracef.h b/include/lttng/tp/lttng-ust-tracef.h index 1be1468c..1bbf33a3 100644 --- a/include/lttng/tp/lttng-ust-tracef.h +++ b/include/lttng/tp/lttng-ust-tracef.h @@ -10,7 +10,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_tracef, event, LTTNG_UST_TP_ARGS(const char *, msg, unsigned int, len, void *, ip), LTTNG_UST_TP_FIELDS( - ctf_sequence_text(char, msg, msg, unsigned int, len) + lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len) ctf_unused(ip) ) ) diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h index c8ae0598..6cae9a74 100644 --- a/include/lttng/tp/lttng-ust-tracelog.h +++ b/include/lttng/tp/lttng-ust-tracelog.h @@ -14,7 +14,7 @@ LTTNG_UST_TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass, lttng_ust_field_integer(int, line, line) ctf_string(file, file) ctf_string(func, func) - ctf_sequence_text(char, msg, msg, unsigned int, len) + lttng_ust_field_sequence_text(char, msg, msg, unsigned int, len) ctf_unused(ip) ) ) diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 01aeb3b7..cbd01cb4 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -607,6 +607,17 @@ lttng_ust__tracepoints__ptrs_destroy(void) #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 #endif /* #if LTTNG_UST_COMPAT_API(0) */ #ifdef __cplusplus @@ -693,14 +704,14 @@ lttng_ust__tracepoints__ptrs_destroy(void) * * * Array Sequence, printed as UTF8-encoded array of bytes * * lttng_ust_field_array_text(char, field_b, string, FIXED_LEN) - * ctf_sequence_text(char, field_c, string, size_t, strlen) + * lttng_ust_field_sequence_text(char, field_c, string, size_t, strlen) * * * String, printed as UTF8-encoded string * * ctf_string(field_e, string) * * * Array sequence of signed integer values * * lttng_ust_field_array(long, field_f, arg4, FIXED_LEN4) - * ctf_sequence(long, field_g, arg4, size_t, arg4_len) + * lttng_ust_field_sequence(long, field_g, arg4, size_t, arg4_len) * ) * ) * diff --git a/include/lttng/ust-tracepoint-event-nowrite.h b/include/lttng/ust-tracepoint-event-nowrite.h index 282462c3..acc61672 100644 --- a/include/lttng/ust-tracepoint-event-nowrite.h +++ b/include/lttng/ust-tracepoint-event-nowrite.h @@ -34,29 +34,29 @@ #define lttng_ust_field_array_text_nowrite(_type, _item, _src, _length) \ lttng_ust__field_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, _length, UTF8, 1, 10) -#undef ctf_sequence_nowrite -#define ctf_sequence_nowrite(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence_nowrite +#define lttng_ust_field_sequence_nowrite(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, none, 1, 10) -#undef ctf_sequence_nowrite_hex -#define ctf_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence_nowrite_hex +#define lttng_ust_field_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, none, 1, 16) -#undef ctf_sequence_network_nowrite -#define ctf_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ +#undef lttng_ust_field_sequence_network_nowrite +#define lttng_ust_field_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ _length_type, _src_length, none, 1, 10) -#undef ctf_sequence_network_nowrite_hex -#define ctf_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ +#undef lttng_ust_field_sequence_network_nowrite_hex +#define lttng_ust_field_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ _length_type, _src_length, none, 1, 16) -#undef ctf_sequence_text_nowrite -#define ctf_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence_text_nowrite +#define lttng_ust_field_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, UTF8, 1, 10) #undef ctf_string_nowrite diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h index bfce5796..9a7ed708 100644 --- a/include/lttng/ust-tracepoint-event-reset.h +++ b/include/lttng/ust-tracepoint-event-reset.h @@ -38,8 +38,8 @@ #define lttng_ust__field_array_encoded(_type, _item, _src, _byte_order, _length, _encoding, \ _nowrite, _elem_type_base) -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) #undef _ctf_string @@ -82,20 +82,20 @@ #undef lttng_ust_field_array_text #define lttng_ust_field_array_text(_type, _item, _src, _length) -#undef ctf_sequence -#define ctf_sequence(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence +#define lttng_ust_field_sequence(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_hex -#define ctf_sequence_hex(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_hex +#define lttng_ust_field_sequence_hex(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_network -#define ctf_sequence_network(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_network +#define lttng_ust_field_sequence_network(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_network_hex -#define ctf_sequence_network_hex(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_network_hex +#define lttng_ust_field_sequence_network_hex(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_text -#define ctf_sequence_text(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_text +#define lttng_ust_field_sequence_text(_type, _item, _src, _length_type, _src_length) #undef ctf_string #define ctf_string(_item, _src) @@ -128,20 +128,20 @@ #undef lttng_ust_field_array_text_nowrite #define lttng_ust_field_array_text_nowrite(_type, _item, _src, _length) -#undef ctf_sequence_nowrite -#define ctf_sequence_nowrite(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_nowrite +#define lttng_ust_field_sequence_nowrite(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_nowrite_hex -#define ctf_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_nowrite_hex +#define lttng_ust_field_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_network_nowrite -#define ctf_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_network_nowrite +#define lttng_ust_field_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_network_nowrite_hex -#define ctf_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_network_nowrite_hex +#define lttng_ust_field_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length) -#undef ctf_sequence_text_nowrite -#define ctf_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) +#undef lttng_ust_field_sequence_text_nowrite +#define lttng_ust_field_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length) #undef ctf_string_nowrite #define ctf_string_nowrite(_item, _src) diff --git a/include/lttng/ust-tracepoint-event-write.h b/include/lttng/ust-tracepoint-event-write.h index a9292dfc..4cecfcc6 100644 --- a/include/lttng/ust-tracepoint-event-write.h +++ b/include/lttng/ust-tracepoint-event-write.h @@ -49,29 +49,29 @@ lttng_ust__field_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length, UTF8, 0, 10) -#undef ctf_sequence -#define ctf_sequence(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence +#define lttng_ust_field_sequence(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, none, 0, 10) -#undef ctf_sequence_hex -#define ctf_sequence_hex(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence_hex +#define lttng_ust_field_sequence_hex(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, none, 0, 16) -#undef ctf_sequence_network -#define ctf_sequence_network(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ +#undef lttng_ust_field_sequence_network +#define lttng_ust_field_sequence_network(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ _length_type, _src_length, none, 0, 10) -#undef ctf_sequence_network_hex -#define ctf_sequence_network_hex(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ +#undef lttng_ust_field_sequence_network_hex +#define lttng_ust_field_sequence_network_hex(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, \ _length_type, _src_length, none, 0, 16) -#undef ctf_sequence_text -#define ctf_sequence_text(_type, _item, _src, _length_type, _src_length) \ - _ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ +#undef lttng_ust_field_sequence_text +#define lttng_ust_field_sequence_text(_type, _item, _src, _length_type, _src_length) \ + lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, UTF8, 0, 10) #undef ctf_string diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index f9c0c88c..2724145e 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -231,8 +231,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG _elem_type_base) \ lttng_ust_field_array_element_type_is_supported(_type, _item); -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, \ _length_type, _src_length, _encoding, _nowrite, \ _elem_type_base) \ lttng_ust_field_array_element_type_is_supported(_type, _item); @@ -299,8 +299,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG .nofilter = 0, \ }), -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, \ _length_type, _src_length, _encoding, _nowrite, \ _elem_type_base) \ LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \ @@ -434,8 +434,8 @@ static void lttng_ust__event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_D __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \ __event_len += sizeof(_type) * (_length); -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) \ if (0) \ (void) (_src); /* Unused */ \ @@ -599,8 +599,8 @@ size_t lttng_ust__event_get_size__##_provider##___##_name( \ __stack_data += sizeof(void *); \ } -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) \ { \ unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \ @@ -680,8 +680,8 @@ void lttng_ust__event_prepare_interpreter_stack__##_provider##___##_name(char *_ (void) (_src); /* Unused */ \ lttng_ust__event_align = lttng_ust__tp_max_t(size_t, lttng_ust__event_align, lttng_ust_rb_alignof(_type)); -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) \ if (0) \ (void) (_src); /* Unused */ \ @@ -759,8 +759,8 @@ size_t lttng_ust__event_get_align__##_provider##___##_name(LTTNG_UST__TP_ARGS_PR else \ __chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), _length); \ -#undef _ctf_sequence_encoded -#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ +#undef lttng_ust__field_sequence_encoded +#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) \ { \ _length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \ diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h index 671d25da..80bc1adb 100644 --- a/src/lib/lttng-ust-dl/ust_dl.h +++ b/src/lib/lttng-ust-dl/ust_dl.h @@ -66,7 +66,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, build_id, LTTNG_UST_TP_FIELDS( ctf_unused(ip) lttng_ust_field_integer_hex(void *, baddr, baddr) - ctf_sequence_hex(uint8_t, build_id, build_id, + lttng_ust_field_sequence_hex(uint8_t, build_id, build_id, size_t, build_id_len) ) ) diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h index d3b18a66..4824379a 100644 --- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h +++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h @@ -61,7 +61,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, build_id, LTTNG_UST_TP_FIELDS( ctf_unused(session) lttng_ust_field_integer_hex(void *, baddr, baddr) - ctf_sequence_hex(uint8_t, build_id, build_id, + lttng_ust_field_sequence_hex(uint8_t, build_id, build_id, size_t, build_id_len) ) ) diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h index f60e8fd7..78d66aa1 100644 --- a/src/lib/lttng-ust/ust_lib.h +++ b/src/lib/lttng-ust/ust_lib.h @@ -47,7 +47,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, build_id, LTTNG_UST_TP_FIELDS( ctf_unused(ip) lttng_ust_field_integer_hex(void *, baddr, baddr) - ctf_sequence_hex(uint8_t, build_id, build_id, + lttng_ust_field_sequence_hex(uint8_t, build_id, build_id, size_t, build_id_len) ) ) diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h index 4bcbce9a..dd59d5a5 100644 --- a/tests/compile/hello.cxx/ust_tests_hello.h +++ b/tests/compile/hello.cxx/ust_tests_hello.h @@ -37,9 +37,9 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, lttng_ust_field_integer_network_hex(int, netintfieldhex, netint) lttng_ust_field_array(long, arrfield1, values, 3) lttng_ust_field_array_text(char, arrfield2, text, 10) - ctf_sequence(char, seqfield1, text, + lttng_ust_field_sequence(char, seqfield1, text, size_t, textlen) - ctf_sequence_text(char, seqfield2, text, + lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) ctf_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h index 450096d2..a949e30f 100644 --- a/tests/compile/hello/ust_tests_hello.h +++ b/tests/compile/hello/ust_tests_hello.h @@ -32,15 +32,15 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, lttng_ust_field_array_network(long, arrfield1_network, values, 3) lttng_ust_field_array_network_hex(long, arrfield1_network_hex, values, 3) lttng_ust_field_array_text(char, arrfield2, text, 10) - ctf_sequence(char, seqfield1, text, + lttng_ust_field_sequence(char, seqfield1, text, size_t, textlen) - ctf_sequence_nowrite(char, seqfield1z, text, + lttng_ust_field_sequence_nowrite(char, seqfield1z, text, size_t, textlen) - ctf_sequence_hex(char, seqfield1_hex, text, + lttng_ust_field_sequence_hex(char, seqfield1_hex, text, size_t, textlen) - ctf_sequence_text(char, seqfield2, text, + lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) - ctf_sequence_network(long, seqfield_network_3, values, + lttng_ust_field_sequence_network(long, seqfield_network_3, values, size_t, 3) ctf_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h index 86ee816c..4fe2b6c6 100644 --- a/tests/compile/test-app-ctx/ust_tests_hello.h +++ b/tests/compile/test-app-ctx/ust_tests_hello.h @@ -27,9 +27,9 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, lttng_ust_field_integer_network_hex(int, netintfieldhex, netint) lttng_ust_field_array(long, arrfield1, values, 3) lttng_ust_field_array_text(char, arrfield2, text, 10) - ctf_sequence(char, seqfield1, text, + lttng_ust_field_sequence(char, seqfield1, text, size_t, textlen) - ctf_sequence_text(char, seqfield2, text, + lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) ctf_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) -- 2.34.1