X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-dl%2Fust_dl.h;h=f3fa0db1a508795557e16614329ec4b230d5861d;hb=3202f63a4d5e599bf22d6711828614b58c7efcba;hp=7f618da778518998927b856f4a02b0ca9dff0531;hpb=4871194b8eadb66e3a9f00cee0372dd7573567ca;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h
index 7f618da7..f3fa0db1 100644
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -5,10 +5,10 @@
  * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_dl
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_dl
 
-#if !defined(_TRACEPOINT_UST_DL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_DL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_DL_H
 
 #ifdef __cplusplus
@@ -22,82 +22,82 @@ extern "C" {
 #define LTTNG_UST_DL_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
-	TP_ARGS(void *, ip, void *, baddr, const char *, path,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
+	LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, const char *, path,
 		int, flags, 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)
-		ctf_integer_hex(int, flags, flags)
-		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_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint64_t, memsz, memsz)
+		lttng_ust_field_integer_hex(int, flags, flags)
+		lttng_ust_field_string(path, path)
+		lttng_ust_field_integer(uint8_t, has_build_id, has_build_id)
+		lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link)
 	)
 )
 
 #ifdef HAVE_DLMOPEN
-TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
-	TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
+	LTTNG_UST_TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
 		const char *, path, int, flags,
 		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)
-		ctf_integer(Lmid_t, nsid, nsid)
-		ctf_integer_hex(int, flags, flags)
-		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_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint64_t, memsz, memsz)
+		lttng_ust_field_integer(Lmid_t, nsid, nsid)
+		lttng_ust_field_integer_hex(int, flags, flags)
+		lttng_ust_field_string(path, path)
+		lttng_ust_field_integer(uint8_t, has_build_id, has_build_id)
+		lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link)
 	)
 )
 #endif
 
-TRACEPOINT_EVENT(lttng_ust_dl, build_id,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, 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_dl, debug_link,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, 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)
-		ctf_string(filename, filename)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint32_t, crc, crc)
+		lttng_ust_field_string(filename, filename)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
-	TP_ARGS(void *, ip, void *, baddr),
-	TP_FIELDS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
+	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_DL_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_dl.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_dl.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>