Tracepoint API namespacing ctf_integer

[lttng-ust.git] / src / lib / lttng-ust-pthread-wrapper / ust_pthread.h

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index 03dfcd3ee564d9b6f7fdb138c2524447b1362a9b..50b0404085ca39eb3e31eecc0b3bd441e3bf7334 100644 (file)
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2013  Mentor Graphics
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_pthread
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_pthread
 
-#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_PTHREAD_H
 
 #ifdef __cplusplus
@@ -19,7 +19,7 @@ extern "C" {
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer_hex(void *, mutex, mutex)
+               lttng_ust_field_integer_hex(void *, mutex, mutex)
                ctf_unused(ip)
        )
 )
@@ -27,8 +27,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer_hex(void *, mutex, mutex)
-               ctf_integer(int, status, status)
+               lttng_ust_field_integer_hex(void *, mutex, mutex)
+               lttng_ust_field_integer(int, status, status)
                ctf_unused(ip)
        )
 )
@@ -36,8 +36,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer_hex(void *, mutex, mutex)
-               ctf_integer(int, status, status)
+               lttng_ust_field_integer_hex(void *, mutex, mutex)
+               lttng_ust_field_integer(int, status, status)
                ctf_unused(ip)
        )
 )
@@ -45,16 +45,16 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
        LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
        LTTNG_UST_TP_FIELDS(
-               ctf_integer_hex(void *, mutex, mutex)
-               ctf_integer(int, status, status)
+               lttng_ust_field_integer_hex(void *, mutex, mutex)
+               lttng_ust_field_integer(int, status, status)
                ctf_unused(ip)
        )
 )
 
 #endif /* _TRACEPOINT_UST_PTHREAD_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_pthread.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_pthread.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>