X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java%2Flttng_ust_java.h;h=f01ba710e42b8c005532089464b463238c6560fe;hb=cce4cff6e966e6d8f6839dcd448a7fa57a1f51c4;hp=54a2087846c4f440efbdbd737d7c4acbb531d311;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 54a20878..f01ba710 100644
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -4,8 +4,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_JAVA_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>