Tracepoint API namespacing ctf_string

[lttng-ust.git] / src / lib / lttng-ust / ust_lib.h

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index d645804b6e3995a0f33de05823bb3e41893967db..ca521a8055930afa6b3cf1a0bdc70cc42789e559 100644 (file)
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -6,8 +6,8 @@
  * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_lib
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_lib
 
 #if !defined(_TRACEPOINT_UST_LIB_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIB_H
@@ -29,11 +29,11 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, load,
                uint8_t, has_debug_link),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_integer(uint64_t, memsz, memsz)
-               ctf_string(path, path)
-               ctf_integer(uint8_t, has_build_id, has_build_id)
-               ctf_integer(uint8_t, has_debug_link, has_debug_link)
+               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, has_build_id, has_build_id)
+               lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link)
        )
 )
 
@@ -46,8 +46,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, build_id,
        ),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_sequence_hex(uint8_t, build_id, build_id,
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
                        size_t, build_id_len)
        )
 )
@@ -61,9 +61,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
        ),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
-               ctf_integer_hex(void *, baddr, baddr)
-               ctf_integer(uint32_t, crc, crc)
-               ctf_string(filename, filename)
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_integer(uint32_t, crc, crc)
+               lttng_ust_field_string(filename, filename)
        )
 )
 
@@ -71,14 +71,14 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
        LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
        LTTNG_UST_TP_FIELDS(
                ctf_unused(ip)
-               ctf_integer_hex(void *, baddr, baddr)
+               lttng_ust_field_integer_hex(void *, baddr, baddr)
        )
 )
 
 #endif /* _TRACEPOINT_UST_LIB_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_lib.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_lib.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>