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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h
index 95c83446c0fd3b0c1292a140532036a9e00240ed..1d17f7408ec20f2f7c0b4a18f9745b1ee5b5c5c4 100644 (file)
--- 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 80b9d3b873450511879cfcfb7ee6d893348caad8..08afecff1c012140fffe113bd772e346e3c392fc 100644 (file)
--- 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 1be1468c253d91729e6162631dbda5f39dc9c24b..1bbf33a3aea8d8b17a2b5b7b0528eddc06a3696c 100644 (file)
--- 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 c8ae05982d4f8285e66ce8c5f26c493386196248..6cae9a74c88a37d2cd579898336734268894885c 100644 (file)
--- 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 01aeb3b7ff5ca189fcd4b0bacaa81c065b79bf44..cbd01cb4f939d8885e12a496816799e9af5f9ea8 100644 (file)
--- 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 282462c359ff9b0386bcbb283f9c3f762db6d67f..acc6167261afb5b9ebe2edeedf9ba35296af93cd 100644 (file)
--- 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 bfce5796cbac9ffc9ebecc37499ccb4bb60a6795..9a7ed708f98fb94538223a992cb05c37981e3be7 100644 (file)
--- 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 a9292dfc2a9521d09ece1d2d6dfc57940dd3bc85..4cecfcc6eab26fa9a6b445eab527f7fa58936f07 100644 (file)
--- 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 f9c0c88ca0128397237d92700f67c7ae8b804d1e..2724145e2c7cc5b8e885b476ec5902b8836e48e8 100644 (file)
--- 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 671d25da0ea43b032a9824c92b7905dac29c50f6..80bc1adb2c7a0ad0591b9a2dbdca2fa8e9651da0 100644 (file)
--- 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 d3b18a667bc68c3afac4e78b67fe2203c6e6dd42..4824379a5b3d61dd6ecfa230673cabf3dab623d5 100644 (file)
--- 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 f60e8fd7a7e8ad09bd7b8d625ac93718617ca44e..78d66aa1cacdfbc337b4fadfc6f933e5b55cfb66 100644 (file)
--- 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 4bcbce9a70bde6cb081f5ef86e26d0a93a5896f8..dd59d5a50184a74d677266259eef3c14baf5ba36 100644 (file)
--- 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 450096d2e2652032b658c0b0c6a95f3eef5d0a65..a949e30fe32c5a4fa41c930911a82cae6561fea1 100644 (file)
--- 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 86ee816c232c1112b4746d8cf2d748afe2a8587a..4fe2b6c6324ebef05dc8e43a8dc6ca2fffe8595c 100644 (file)
--- 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)