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

diff --git a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
index 089c1018daf2032e8e138491af828dbdf8a3c7a7..2ac10d81f4793071174ca7171074a0a984632539 100644 (file)
--- 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 1d17f7408ec20f2f7c0b4a18f9745b1ee5b5c5c4..ffdefa594e695c37cd9aae7a8f99525ca35b9eff 100644 (file)
--- 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 d6eb19dd950a6a6adce0d0a061e21357ad88ba96..39d748e7cb43da1b0b7f2c5383e6fdbf6ffea945 100644 (file)
--- 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 62489262468085d35b07a90331a41e8aa16b93e2..47462415c9ec8cb61c705547c0e0e605f9b5d677 100644 (file)
--- 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 08afecff1c012140fffe113bd772e346e3c392fc..2e17be17ee27b9ea7853e72f9e57f9e630ed4b20 100644 (file)
--- 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 6cae9a74c88a37d2cd579898336734268894885c..76b0cb300b420a33eb17aab31db73891196aab19 100644 (file)
--- 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 cbd01cb4f939d8885e12a496816799e9af5f9ea8..9ec52ef907880f3304c28e6cd8b1b4ba83500ae6 100644 (file)
--- 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 acc6167261afb5b9ebe2edeedf9ba35296af93cd..3ae9685566fefb7c7ee21c3fc5ae4da58ce6f9d2 100644 (file)
--- 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 9a7ed708f98fb94538223a992cb05c37981e3be7..3262e0b0738f9606bb94a22c3171a521ce886777 100644 (file)
--- 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 4cecfcc6eab26fa9a6b445eab527f7fa58936f07..1e019672bf1e8a7ba1b432a8e7cc648359384f17 100644 (file)
--- 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 2724145e2c7cc5b8e885b476ec5902b8836e48e8..8ddf89c4599bb15fd315bdef2b223bf62c95b85f 100644 (file)
--- 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 80bc1adb2c7a0ad0591b9a2dbdca2fa8e9651da0..f3fa0db1a508795557e16614329ec4b230d5861d 100644 (file)
--- 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 b180f086e5dc47214aad6e683636fc2e62ab616c..c2e9fd3a19823913f24ac91c75fe9260fd0a28fe 100644 (file)
--- 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 16cbdc3b0b0a9462e942727718f4cf47f2a9f9b7..c10145abdf2bbebdfccd3e980c95d882c39ba109 100644 (file)
--- 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 82f2357721c3000164769cffa9df8eef95f9fae9..f01ba710e42b8c005532089464b463238c6560fe 100644 (file)
--- 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 c9bfdd0ceb4b967587d1594ef9cf35f17ebb46ee..aa77bd1a404e983cd387e57b1e698ba0a2831590 100644 (file)
--- 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 4824379a5b3d61dd6ecfa230673cabf3dab623d5..a77e3fd0caa73dd2a9bdd3c32b32299b7c5f9d3a 100644 (file)
--- 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 78d66aa1cacdfbc337b4fadfc6f933e5b55cfb66..ca521a8055930afa6b3cf1a0bdc70cc42789e559 100644 (file)
--- 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 dd59d5a50184a74d677266259eef3c14baf5ba36..3fd0f76a8115168e4e4cf2dbb7b9281bf3209005 100644 (file)
--- 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 a949e30fe32c5a4fa41c930911a82cae6561fea1..639c7c9f89e3e2f2772c76e312458d53cebafe0b 100644 (file)
--- 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 4fe2b6c6324ebef05dc8e43a8dc6ca2fffe8595c..a73717ae17eeb3e91eb34e3ceb702929c893cc3d 100644 (file)
--- 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)