X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java%2Flttng_ust_java.h;h=8b9e9721a611b68ea7b62a4eac88d1f67359ad66;hb=b33b46f7161604cb9168e9bbc854413cf18269be;hp=67e8d2d75b4825407d672c02fe8f914d0c35bfb3;hpb=11dfd4ee2d1833b4f67c3016631f8fa411646012;p=lttng-ust.git

diff --git a/liblttng-ust-java/lttng_ust_java.h b/liblttng-ust-java/lttng_ust_java.h
index 67e8d2d7..8b9e9721 100644
--- a/liblttng-ust-java/lttng_ust_java.h
+++ b/liblttng-ust-java/lttng_ust_java.h
@@ -1,8 +1,8 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_java
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER lttng_ust_java
 
-#if !defined(_TRACEPOINT_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_JAVA_H
+#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_LTTNG_UST_JAVA_H
 
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -24,21 +24,52 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_java_string,
-	TP_PROTO(const char *name, const char *args),
-	TP_VARS(name, args),
+TRACEPOINT_EVENT(lttng_ust_java, int_event,
+	TP_ARGS(const char *, name, int, payload),
 	TP_FIELDS(
 		ctf_string(name, name)
-		ctf_string(args, args)
+		ctf_integer(int, int_payload, payload)
 	)
 )
 
-#endif /* _TRACEPOINT_UST_JAVA_H */
+TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
+	TP_ARGS(const char *, name, int, payload1, int, payload2),
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_integer(int, int_payload1, payload1)
+		ctf_integer(int, int_payload2, payload2)
+	)
+)
+
+TRACEPOINT_EVENT(lttng_ust_java, long_event,
+	TP_ARGS(const char *, name, long, payload),
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_integer(long, long_payload, payload)
+	)
+)
+
+TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
+	TP_ARGS(const char *, name, long, payload1, long, payload2),
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_integer(long, long_payload1, payload1)
+		ctf_integer(long, long_payload2, payload2)
+	)
+)
+
+TRACEPOINT_EVENT(lttng_ust_java, string_event,
+	TP_ARGS(const char *, name, const char *, payload),
+	TP_FIELDS(
+		ctf_string(name, name)
+		ctf_string(string_payload, payload)
+	)
+)
+
+#endif /* _TRACEPOINT_LTTNG_UST_JAVA_H */
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE lttng_ust_java
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./lttng_ust_java.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>