X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Fust_lib.h;h=63269f0ba55d22dbfa75a9bf9d8f86eb6fd19902;hb=08ba2503b86d1506117c077c99eb1c38973a48f3;hp=d645804b6e3995a0f33de05823bb3e41893967db;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index d645804b..63269f0b 100644
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -6,8 +6,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIB_H
@@ -28,12 +28,12 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, load,
 		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_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_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)
 	)
 )
 
@@ -45,9 +45,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, 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)
 	)
 )
@@ -60,25 +60,25 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, 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_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_unused(ip)
+		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>