X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java%2Flttng_ust_java.h;h=82f2357721c3000164769cffa9df8eef95f9fae9;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=ea515a84dd6e25dc3def59334c4822d67cd34a1f;hpb=3081c83f06d9a65cae1507a5db358df84ed7c192;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 ea515a84..82f23577 100644
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -4,51 +4,51 @@
  * 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>
 
-TRACEPOINT_EVENT(lttng_ust_java, int_event,
-	TP_ARGS(const char *, name, int, payload),
-	TP_FIELDS(
+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_integer(int, int_payload, payload)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
-	TP_ARGS(const char *, name, int, payload1, int, payload2),
-	TP_FIELDS(
+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_integer(int, int_payload1, payload1)
+		lttng_ust_field_integer(int, int_payload2, payload2)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_event,
-	TP_ARGS(const char *, name, long, payload),
-	TP_FIELDS(
+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_integer(long, long_payload, payload)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
-	TP_ARGS(const char *, name, long, payload1, long, payload2),
-	TP_FIELDS(
+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_integer(long, long_payload1, payload1)
+		lttng_ust_field_integer(long, long_payload2, payload2)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, string_event,
-	TP_ARGS(const char *, name, const char *, payload),
-	TP_FIELDS(
+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)
 	)
@@ -56,8 +56,8 @@ TRACEPOINT_EVENT(lttng_ust_java, string_event,
 
 #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>