X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-dl%2Fust_dl.h;h=80bc1adb2c7a0ad0591b9a2dbdca2fa8e9651da0;hb=1d188af9688feee0ec4e34038113a0edccddd4ea;hp=01c32ddc74877a9b85352a0da88065b48b75abbd;hpb=efa14d169c6336fa8b9f478538ac7968ef9c0338;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 01c32ddc..80bc1adb 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,41 +22,41 @@ extern "C" {
 #define LTTNG_UST_DL_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
+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),
 	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)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint64_t, memsz, memsz)
+		lttng_ust_field_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(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,
+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),
 	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)
+		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)
 		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)
 	)
 )
 #endif
 
-TRACEPOINT_EVENT(lttng_ust_dl, build_id,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, build_id,
 	LTTNG_UST_TP_ARGS(
 		void *, ip,
 		void *, baddr,
@@ -65,13 +65,13 @@ TRACEPOINT_EVENT(lttng_ust_dl, build_id,
 	),
 	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,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 	LTTNG_UST_TP_ARGS(
 		void *, ip,
 		void *, baddr,
@@ -80,24 +80,24 @@ TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 	),
 	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_dl, dlclose,
+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>