Tracepoint API namespacing 'TRACEPOINT_INCLUDE'

[lttng-ust.git] / src / lib / lttng-ust-libc-wrapper / ust_libc.h

diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
index c4e7e4bf58c4d849be81fb420cabeb69a201725f..437b33d4e1f1d27f861fc60114c2930700bd20e5 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -7,7 +7,7 @@
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER lttng_ust_libc
 
-#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIBC_H
 
 #ifdef __cplusplus
@@ -16,26 +16,26 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_libc, malloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, malloc,
        LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
                ctf_unused(ip)
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, free,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, free,
        LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, ptr, ptr)
                ctf_unused(ip)
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, calloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, calloc,
        LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, nmemb, nmemb)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -43,9 +43,9 @@ TRACEPOINT_EVENT(lttng_ust_libc, calloc,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, realloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, realloc,
        LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, in_ptr, in_ptr)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -53,9 +53,9 @@ TRACEPOINT_EVENT(lttng_ust_libc, realloc,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, memalign,
        LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer(size_t, alignment, alignment)
                ctf_integer(size_t, size, size)
                ctf_integer_hex(void *, ptr, ptr)
@@ -63,9 +63,9 @@ TRACEPOINT_EVENT(lttng_ust_libc, memalign,
        )
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
        LTTNG_UST_TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_integer_hex(void *, out_ptr, out_ptr)
                ctf_integer(size_t, alignment, alignment)
                ctf_integer(size_t, size, size)
@@ -76,8 +76,8 @@ TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
 
 #endif /* _TRACEPOINT_UST_LIBC_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_libc.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_libc.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>