X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-dl%2Fust_dl.h;h=2808f76bbf32891493fee9b4f97d9c4b5f3b2cb8;hb=b6659287e99e16eb826ceff27b17cc1058967693;hp=830dc58c9668ebf9dd0d185140db5d91ca2a0fc8;hpb=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e;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 830dc58c..2808f76b 100644
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -5,8 +5,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_DL_H
@@ -27,13 +27,13 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
 		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)
-		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_unused(ip)
+		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)
 	)
 )
 
@@ -44,14 +44,14 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
 		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)
-		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_unused(ip)
+		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
@@ -64,9 +64,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, build_id,
 		size_t, build_id_len
 	),
 	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_unused(ip)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_sequence_hex(uint8_t, build_id, build_id,
 			size_t, build_id_len)
 	)
 )
@@ -79,18 +79,18 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, debug_link,
 		uint32_t, crc
 	),
 	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_unused(ip)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint32_t, crc, crc)
+		lttng_ust_field_string(filename, filename)
 	)
 )
 
 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_unused(ip)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
 	)
 )