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

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index d3814b61..78d66aa1 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
@@ -29,11 +29,11 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, load,
 		uint8_t, has_debug_link),
 	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)
 	)
 )
 
@@ -46,8 +46,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, 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)
 	)
 )
@@ -61,8 +61,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, 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)
 	)
 )
@@ -71,7 +71,7 @@ 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)
 	)
 )