Fix: combined tracing of lttng-ust 2.12/2.13 generates corrupted traces

[lttng-ust.git] / src / lib / lttng-ust / lttng-ust-statedump-provider.h

diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
index 3b2f85100d9b13cec53a1042e3a65e09e201cf2f..916a356499be0e45d155eede828285dd2b040cf6 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -5,8 +5,8 @@
  * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_statedump
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_statedump
 
 #if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_STATEDUMP_H
@@ -26,7 +26,7 @@ extern "C" {
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
+               lttng_ust_field_unused(session)
        )
 )
 
@@ -41,13 +41,13 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
                uint8_t, has_debug_link
        ),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_integer(uint64_t, memsz, memsz)
-               ctf_string(path, path)
-               ctf_integer(uint8_t, is_pic, is_pic)
-               ctf_integer(uint8_t, has_build_id, has_build_id)
-               ctf_integer(uint8_t, has_debug_link, has_debug_link)
+               lttng_ust_field_unused(session)
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_integer(uint64_t, memsz, memsz)
+               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)
        )
 )
 
@@ -59,9 +59,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
                size_t, build_id_len
        ),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_sequence_hex(uint8_t, build_id, build_id,
+               lttng_ust_field_unused(session)
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
                        size_t, build_id_len)
        )
 )
@@ -74,10 +74,10 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
                uint32_t, crc
        ),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_integer(uint32_t, crc, crc)
-               ctf_string(filename, filename)
+               lttng_ust_field_unused(session)
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_integer(uint32_t, crc, crc)
+               lttng_ust_field_string(filename, filename)
        )
 )
 
@@ -87,15 +87,15 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, procname,
                char *, name
        ),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
-               ctf_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
+               lttng_ust_field_unused(session)
+               lttng_ust_field_array_text(char, procname, name, LTTNG_UST_CONTEXT_PROCNAME_LEN)
        )
 )
 
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
        LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
        LTTNG_UST_TP_FIELDS(
-               ctf_unused(session)
+               lttng_ust_field_unused(session)
        )
 )