From 3202f63a4d5e599bf22d6711828614b58c7efcba Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 21 Apr 2021 17:04:19 -0400 Subject: [PATCH] Tracepoint API namespacing ctf_string 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: I5ca6f4574a10b62c397af2f20312e309f6b59563 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .../tracepoint-provider.h | 4 ++-- doc/examples/demo/ust_tests_demo2.h | 2 +- .../easy-ust/sample_component_provider.h | 4 ++-- doc/examples/gen-tp/sample_tracepoint.tp | 2 +- .../hello-static-lib/ust_tests_hello.h | 2 +- include/lttng/tp/lttng-ust-tracelog.h | 4 ++-- include/lttng/tracepoint.h | 5 ++++- include/lttng/ust-tracepoint-event-nowrite.h | 6 +++--- include/lttng/ust-tracepoint-event-reset.h | 12 +++++------ include/lttng/ust-tracepoint-event-write.h | 6 +++--- include/lttng/ust-tracepoint-event.h | 20 +++++++++---------- src/lib/lttng-ust-dl/ust_dl.h | 6 +++--- .../jni/jul/lttng_ust_jul.h | 8 ++++---- .../jni/log4j/lttng_ust_log4j.h | 12 +++++------ src/lib/lttng-ust-java/lttng_ust_java.h | 12 +++++------ .../lttng-ust-python-agent/lttng_ust_python.h | 10 +++++----- .../lttng-ust/lttng-ust-statedump-provider.h | 4 ++-- src/lib/lttng-ust/ust_lib.h | 4 ++-- tests/compile/hello.cxx/ust_tests_hello.h | 2 +- tests/compile/hello/ust_tests_hello.h | 2 +- tests/compile/test-app-ctx/ust_tests_hello.h | 2 +- 21 files changed, 66 insertions(+), 63 deletions(-) diff --git a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h index 089c1018..2ac10d81 100644 --- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h +++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h @@ -22,7 +22,7 @@ LTTNG_UST_TRACEPOINT_EVENT( const char *, query_name ), LTTNG_UST_TP_FIELDS( - ctf_string(query_name, query_name) + lttng_ust_field_string(query_name, query_name) ) ) @@ -33,7 +33,7 @@ LTTNG_UST_TRACEPOINT_EVENT( const char *, alignment ), LTTNG_UST_TP_FIELDS( - ctf_string(alignment, alignment) + lttng_ust_field_string(alignment, alignment) ) ) diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h index 1d17f740..ffdefa59 100644 --- a/doc/examples/demo/ust_tests_demo2.h +++ b/doc/examples/demo/ust_tests_demo2.h @@ -29,7 +29,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo2, loop, size_t, textlen) lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) - ctf_string(stringfield, text) + lttng_ust_field_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) lttng_ust_field_float(double, doublefield, doublearg) ) diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h index d6eb19dd..39d748e7 100644 --- a/doc/examples/easy-ust/sample_component_provider.h +++ b/doc/examples/easy-ust/sample_component_provider.h @@ -81,10 +81,10 @@ LTTNG_UST_TRACEPOINT_EVENT( */ LTTNG_UST_TP_FIELDS( /* - * The ctf_string macro takes a c string and writes it into a field + * The lttng_ust_field_string macro takes a c string and writes it into a field * named "message" */ - ctf_string(message, text) + lttng_ust_field_string(message, text) ) ) /* diff --git a/doc/examples/gen-tp/sample_tracepoint.tp b/doc/examples/gen-tp/sample_tracepoint.tp index 62489262..47462415 100644 --- a/doc/examples/gen-tp/sample_tracepoint.tp +++ b/doc/examples/gen-tp/sample_tracepoint.tp @@ -3,7 +3,7 @@ LTTNG_UST_TRACEPOINT_EVENT( message, // C++ Style comment LTTNG_UST_TP_ARGS(const char *, text), LTTNG_UST_TP_FIELDS( - ctf_string(message, text) + lttng_ust_field_string(message, text) ) ) /* diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h index 08afecff..2e17be17 100644 --- a/doc/examples/hello-static-lib/ust_tests_hello.h +++ b/doc/examples/hello-static-lib/ust_tests_hello.h @@ -29,7 +29,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, size_t, textlen) lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) - ctf_string(stringfield, text) + lttng_ust_field_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) lttng_ust_field_float(double, doublefield, doublearg) ) diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h index 6cae9a74..76b0cb30 100644 --- a/include/lttng/tp/lttng-ust-tracelog.h +++ b/include/lttng/tp/lttng-ust-tracelog.h @@ -12,8 +12,8 @@ LTTNG_UST_TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass, const char *, msg, unsigned int, len, void *, ip), LTTNG_UST_TP_FIELDS( lttng_ust_field_integer(int, line, line) - ctf_string(file, file) - ctf_string(func, func) + lttng_ust_field_string(file, file) + lttng_ust_field_string(func, func) 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 cbd01cb4..9ec52ef9 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -618,6 +618,9 @@ lttng_ust__tracepoints__ptrs_destroy(void) #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 #endif /* #if LTTNG_UST_COMPAT_API(0) */ #ifdef __cplusplus @@ -707,7 +710,7 @@ lttng_ust__tracepoints__ptrs_destroy(void) * lttng_ust_field_sequence_text(char, field_c, string, size_t, strlen) * * * String, printed as UTF8-encoded string * - * ctf_string(field_e, string) + * lttng_ust_field_string(field_e, string) * * * Array sequence of signed integer values * * lttng_ust_field_array(long, field_f, arg4, FIXED_LEN4) diff --git a/include/lttng/ust-tracepoint-event-nowrite.h b/include/lttng/ust-tracepoint-event-nowrite.h index acc61672..3ae96855 100644 --- a/include/lttng/ust-tracepoint-event-nowrite.h +++ b/include/lttng/ust-tracepoint-event-nowrite.h @@ -59,9 +59,9 @@ lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, UTF8, 1, 10) -#undef ctf_string_nowrite -#define ctf_string_nowrite(_item, _src) \ - _ctf_string(_item, _src, 1) +#undef lttng_ust_field_string_nowrite +#define lttng_ust_field_string_nowrite(_item, _src) \ + lttng_ust__field_string(_item, _src, 1) #undef ctf_unused_nowrite #define ctf_unused_nowrite(_src) \ diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h index 9a7ed708..3262e0b0 100644 --- a/include/lttng/ust-tracepoint-event-reset.h +++ b/include/lttng/ust-tracepoint-event-reset.h @@ -42,8 +42,8 @@ #define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \ _src_length, _encoding, _nowrite, _elem_type_base) -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) #undef _ctf_unused #define _ctf_unused(_src) @@ -97,8 +97,8 @@ #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) +#undef lttng_ust_field_string +#define lttng_ust_field_string(_item, _src) #undef ctf_unused #define ctf_unused(_src) @@ -143,8 +143,8 @@ #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) +#undef lttng_ust_field_string_nowrite +#define lttng_ust_field_string_nowrite(_item, _src) #undef ctf_unused_nowrite #define ctf_unused_nowrite(_src) diff --git a/include/lttng/ust-tracepoint-event-write.h b/include/lttng/ust-tracepoint-event-write.h index 4cecfcc6..1e019672 100644 --- a/include/lttng/ust-tracepoint-event-write.h +++ b/include/lttng/ust-tracepoint-event-write.h @@ -74,9 +74,9 @@ lttng_ust__field_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, \ _length_type, _src_length, UTF8, 0, 10) -#undef ctf_string -#define ctf_string(_item, _src) \ - _ctf_string(_item, _src, 0) +#undef lttng_ust_field_string +#define lttng_ust_field_string(_item, _src) \ + lttng_ust__field_string(_item, _src, 0) #undef ctf_unused #define ctf_unused(_src) \ diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 2724145e..8ddf89c4 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -327,8 +327,8 @@ void lttng_ust__event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARG .nofilter = 0, \ }), -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) \ +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) \ LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \ .struct_size = sizeof(struct lttng_ust_event_field), \ .name = #_item, \ @@ -446,8 +446,8 @@ static void lttng_ust__event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_D __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ __dynamic_len_idx++; -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) \ +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) \ __event_len += __dynamic_len[__dynamic_len_idx++] = \ strlen((_src) ? (_src) : LTTNG_UST__NULL_STRING) + 1; @@ -611,8 +611,8 @@ size_t lttng_ust__event_get_size__##_provider##___##_name( \ __stack_data += sizeof(void *); \ } -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) \ +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) \ { \ const void *__ctf_tmp_ptr = \ ((_src) ? (_src) : LTTNG_UST__NULL_STRING); \ @@ -690,8 +690,8 @@ void lttng_ust__event_prepare_interpreter_stack__##_provider##___##_name(char *_ lttng_ust__event_align = lttng_ust__tp_max_t(size_t, lttng_ust__event_align, lttng_ust_rb_alignof(_length_type)); \ lttng_ust__event_align = lttng_ust__tp_max_t(size_t, lttng_ust__event_align, lttng_ust_rb_alignof(_type)); -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) \ +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) \ if (0) \ (void) (_src); /* Unused */ @@ -772,8 +772,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), lttng_ust__get_dynamic_len(dest)); \ -#undef _ctf_string -#define _ctf_string(_item, _src, _nowrite) \ +#undef lttng_ust__field_string +#define lttng_ust__field_string(_item, _src, _nowrite) \ { \ const char *__ctf_tmp_string = \ ((_src) ? (_src) : LTTNG_UST__NULL_STRING); \ diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h index 80bc1adb..f3fa0db1 100644 --- a/src/lib/lttng-ust-dl/ust_dl.h +++ b/src/lib/lttng-ust-dl/ust_dl.h @@ -31,7 +31,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlopen, lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint64_t, memsz, memsz) lttng_ust_field_integer_hex(int, flags, flags) - ctf_string(path, path) + lttng_ust_field_string(path, path) lttng_ust_field_integer(uint8_t, has_build_id, has_build_id) lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link) ) @@ -49,7 +49,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlmopen, lttng_ust_field_integer(uint64_t, memsz, memsz) lttng_ust_field_integer(Lmid_t, nsid, nsid) lttng_ust_field_integer_hex(int, flags, flags) - ctf_string(path, path) + lttng_ust_field_string(path, path) lttng_ust_field_integer(uint8_t, has_build_id, has_build_id) lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link) ) @@ -82,7 +82,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, debug_link, ctf_unused(ip) lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint32_t, crc, crc) - ctf_string(filename, filename) + lttng_ust_field_string(filename, filename) ) ) diff --git a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h index b180f086..c2e9fd3a 100644 --- a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h +++ b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h @@ -25,10 +25,10 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event, int, log_level, int, thread_id), LTTNG_UST_TP_FIELDS( - ctf_string(msg, msg) - ctf_string(logger_name, logger_name) - ctf_string(class_name, class_name) - ctf_string(method_name, method_name) + lttng_ust_field_string(msg, msg) + lttng_ust_field_string(logger_name, logger_name) + lttng_ust_field_string(class_name, class_name) + lttng_ust_field_string(method_name, method_name) lttng_ust_field_integer(long, long_millis, millis) lttng_ust_field_integer(int, int_loglevel, log_level) lttng_ust_field_integer(int, int_threadid, thread_id) diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h index 16cbdc3b..c10145ab 100644 --- a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h +++ b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h @@ -27,15 +27,15 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event, int, log_level, const char *, thread_name), LTTNG_UST_TP_FIELDS( - ctf_string(msg, msg) - ctf_string(logger_name, logger_name) - ctf_string(class_name, class_name) - ctf_string(method_name, method_name) - ctf_string(filename, file_name) + lttng_ust_field_string(msg, msg) + lttng_ust_field_string(logger_name, logger_name) + lttng_ust_field_string(class_name, class_name) + lttng_ust_field_string(method_name, method_name) + lttng_ust_field_string(filename, file_name) lttng_ust_field_integer(int, line_number, line_number) lttng_ust_field_integer(long, timestamp, timestamp) lttng_ust_field_integer(int, int_loglevel, log_level) - ctf_string(thread_name, thread_name) + lttng_ust_field_string(thread_name, thread_name) ) ) diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h index 82f23577..f01ba710 100644 --- a/src/lib/lttng-ust-java/lttng_ust_java.h +++ b/src/lib/lttng-ust-java/lttng_ust_java.h @@ -15,7 +15,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_event, LTTNG_UST_TP_ARGS(const char *, name, int, payload), LTTNG_UST_TP_FIELDS( - ctf_string(name, name) + lttng_ust_field_string(name, name) lttng_ust_field_integer(int, int_payload, payload) ) ) @@ -23,7 +23,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_event, LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_int_event, LTTNG_UST_TP_ARGS(const char *, name, int, payload1, int, payload2), LTTNG_UST_TP_FIELDS( - ctf_string(name, name) + lttng_ust_field_string(name, name) lttng_ust_field_integer(int, int_payload1, payload1) lttng_ust_field_integer(int, int_payload2, payload2) ) @@ -32,7 +32,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_int_event, LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_event, LTTNG_UST_TP_ARGS(const char *, name, long, payload), LTTNG_UST_TP_FIELDS( - ctf_string(name, name) + lttng_ust_field_string(name, name) lttng_ust_field_integer(long, long_payload, payload) ) ) @@ -40,7 +40,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_event, LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_long_event, LTTNG_UST_TP_ARGS(const char *, name, long, payload1, long, payload2), LTTNG_UST_TP_FIELDS( - ctf_string(name, name) + lttng_ust_field_string(name, name) lttng_ust_field_integer(long, long_payload1, payload1) lttng_ust_field_integer(long, long_payload2, payload2) ) @@ -49,8 +49,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_long_event, LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, string_event, LTTNG_UST_TP_ARGS(const char *, name, const char *, payload), LTTNG_UST_TP_FIELDS( - ctf_string(name, name) - ctf_string(string_payload, payload) + lttng_ust_field_string(name, name) + lttng_ust_field_string(string_payload, payload) ) ) diff --git a/src/lib/lttng-ust-python-agent/lttng_ust_python.h b/src/lib/lttng-ust-python-agent/lttng_ust_python.h index c9bfdd0c..aa77bd1a 100644 --- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h +++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h @@ -25,14 +25,14 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_python, event, const char *, threadName ), LTTNG_UST_TP_FIELDS( - ctf_string(asctime, asctime) - ctf_string(msg, msg) - ctf_string(logger_name, logger_name) - ctf_string(funcName, funcName) + lttng_ust_field_string(asctime, asctime) + lttng_ust_field_string(msg, msg) + lttng_ust_field_string(logger_name, logger_name) + lttng_ust_field_string(funcName, funcName) lttng_ust_field_integer(unsigned int, lineno, lineno) lttng_ust_field_integer(unsigned int, int_loglevel, int_loglevel) lttng_ust_field_integer(unsigned int, thread, thread) - ctf_string(threadName, threadName) + lttng_ust_field_string(threadName, threadName) ) ) diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h index 4824379a..a77e3fd0 100644 --- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h +++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h @@ -44,7 +44,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, bin_info, ctf_unused(session) lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint64_t, memsz, memsz) - ctf_string(path, path) + lttng_ust_field_string(path, path) lttng_ust_field_integer(uint8_t, is_pic, is_pic) lttng_ust_field_integer(uint8_t, has_build_id, has_build_id) lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link) @@ -77,7 +77,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, debug_link, ctf_unused(session) lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint32_t, crc, crc) - ctf_string(filename, filename) + lttng_ust_field_string(filename, filename) ) ) diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h index 78d66aa1..ca521a80 100644 --- a/src/lib/lttng-ust/ust_lib.h +++ b/src/lib/lttng-ust/ust_lib.h @@ -31,7 +31,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, load, ctf_unused(ip) lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint64_t, memsz, memsz) - ctf_string(path, path) + lttng_ust_field_string(path, path) lttng_ust_field_integer(uint8_t, has_build_id, has_build_id) lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link) ) @@ -63,7 +63,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, debug_link, ctf_unused(ip) lttng_ust_field_integer_hex(void *, baddr, baddr) lttng_ust_field_integer(uint32_t, crc, crc) - ctf_string(filename, filename) + lttng_ust_field_string(filename, filename) ) ) diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h index dd59d5a5..3fd0f76a 100644 --- a/tests/compile/hello.cxx/ust_tests_hello.h +++ b/tests/compile/hello.cxx/ust_tests_hello.h @@ -41,7 +41,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, size_t, textlen) lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) - ctf_string(stringfield, text) + lttng_ust_field_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) lttng_ust_field_float(double, doublefield, doublearg) ctf_enum(ust_tests_hello, my_enum, int, enumfield, enumarg) diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h index a949e30f..639c7c9f 100644 --- a/tests/compile/hello/ust_tests_hello.h +++ b/tests/compile/hello/ust_tests_hello.h @@ -42,7 +42,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, size_t, textlen) lttng_ust_field_sequence_network(long, seqfield_network_3, values, size_t, 3) - ctf_string(stringfield, text) + lttng_ust_field_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) lttng_ust_field_float(double, doublefield, doublearg) lttng_ust_field_integer(bool, boolfield, boolarg) diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h index 4fe2b6c6..a73717ae 100644 --- a/tests/compile/test-app-ctx/ust_tests_hello.h +++ b/tests/compile/test-app-ctx/ust_tests_hello.h @@ -31,7 +31,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest, size_t, textlen) lttng_ust_field_sequence_text(char, seqfield2, text, size_t, textlen) - ctf_string(stringfield, text) + lttng_ust_field_string(stringfield, text) lttng_ust_field_float(float, floatfield, floatarg) lttng_ust_field_float(double, doublefield, doublearg) lttng_ust_field_integer(bool, boolfield, boolarg) -- 2.34.1