Tracepoint API namespacing ctf_string

[lttng-ust.git] / src / lib / lttng-ust-java / lttng_ust_java.h

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 12026f781fe9965c18f625c66f9f4c22faf9f009..f01ba710e42b8c005532089464b463238c6560fe 100644 (file)
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_java
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_java
 
-#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_JAVA_H
 
 #include <lttng/tracepoint.h>
@@ -15,49 +15,49 @@
 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)
-               ctf_integer(int, int_payload, payload)
+               lttng_ust_field_string(name, name)
+               lttng_ust_field_integer(int, int_payload, payload)
        )
 )
 
 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)
-               ctf_integer(int, int_payload1, payload1)
-               ctf_integer(int, int_payload2, payload2)
+               lttng_ust_field_string(name, name)
+               lttng_ust_field_integer(int, int_payload1, payload1)
+               lttng_ust_field_integer(int, int_payload2, payload2)
        )
 )
 
 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)
-               ctf_integer(long, long_payload, payload)
+               lttng_ust_field_string(name, name)
+               lttng_ust_field_integer(long, long_payload, payload)
        )
 )
 
 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)
-               ctf_integer(long, long_payload1, payload1)
-               ctf_integer(long, long_payload2, payload2)
+               lttng_ust_field_string(name, name)
+               lttng_ust_field_integer(long, long_payload1, payload1)
+               lttng_ust_field_integer(long, long_payload2, payload2)
        )
 )
 
 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)
        )
 )
 
 #endif /* _TRACEPOINT_LTTNG_UST_JAVA_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_java.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_java.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>