X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Fust_lib.h;h=78d66aa1cacdfbc337b4fadfc6f933e5b55cfb66;hb=1d188af9688feee0ec4e34038113a0edccddd4ea;hp=f704efb61d86e36822f5b62043d5042a729dfed1;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index f704efb6..78d66aa1 100644
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -6,10 +6,10 @@
  * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_lib
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_lib
 
-#if !defined(_TRACEPOINT_UST_LIB_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_LIB_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIB_H
 
 #ifdef __cplusplus
@@ -23,62 +23,62 @@ extern "C" {
 #define LTTNG_UST_LIB_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_lib, load,
-	TP_ARGS(void *, ip, void *, baddr, const char*, path,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, load,
+	LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, const char*, path,
 		uint64_t, memsz, uint8_t, has_build_id,
 		uint8_t, has_debug_link),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(ip)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_integer(uint64_t, memsz, memsz)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint64_t, memsz, memsz)
 		ctf_string(path, path)
-		ctf_integer(uint8_t, has_build_id, has_build_id)
-		ctf_integer(uint8_t, has_debug_link, has_debug_link)
+		lttng_ust_field_integer(uint8_t, has_build_id, has_build_id)
+		lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, build_id,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, build_id,
+	LTTNG_UST_TP_ARGS(
 		void *, ip,
 		void *, baddr,
 		uint8_t *, build_id,
 		size_t, build_id_len
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(ip)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_sequence_hex(uint8_t, build_id, build_id,
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
 			size_t, build_id_len)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, debug_link,
+	LTTNG_UST_TP_ARGS(
 		void *, ip,
 		void *, baddr,
 		char *, filename,
 		uint32_t, crc
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(ip)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_integer(uint32_t, crc, crc)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint32_t, crc, crc)
 		ctf_string(filename, filename)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_lib, unload,
-	TP_ARGS(void *, ip, void *, baddr),
-	TP_FIELDS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
+	LTTNG_UST_TP_ARGS(void *, ip, void *, baddr),
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(ip)
-		ctf_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
 	)
 )
 
 #endif /* _TRACEPOINT_UST_LIB_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_lib.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_lib.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>