X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-statedump-provider.h;h=d3b18a667bc68c3afac4e78b67fe2203c6e6dd42;hb=10937ee5c85456292ce4e8d67c9ac7bc37caf974;hp=c6600f349b4281614d4ccb2e5df8bc14220425f0;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
index c6600f34..d3b18a66 100644
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -5,10 +5,10 @@
  * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_statedump
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_statedump
 
-#if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_STATEDUMP_H
 
 #ifdef __cplusplus
@@ -23,15 +23,15 @@ extern "C" {
 #define LTTNG_UST_STATEDUMP_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_statedump, start,
-	TP_ARGS(struct lttng_ust_session *, session),
-	TP_FIELDS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
+	LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
+	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
 		const char*, path,
@@ -40,69 +40,69 @@ TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
 		uint8_t, has_build_id,
 		uint8_t, has_debug_link
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
-		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, is_pic, is_pic)
-		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, is_pic, is_pic)
+		lttng_ust_field_integer(uint8_t, has_build_id, has_build_id)
+		lttng_ust_field_integer(uint8_t, has_debug_link, has_debug_link)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
+	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
 		uint8_t *, build_id,
 		size_t, build_id_len
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
-		ctf_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
 		ctf_sequence_hex(uint8_t, build_id, build_id,
 			size_t, build_id_len)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
+	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
 		char *, filename,
 		uint32_t, crc
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
-		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_statedump, procname,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, procname,
+	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		char *, name
 	),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
-		ctf_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
+		lttng_ust_field_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, end,
-	TP_ARGS(struct lttng_ust_session *, session),
-	TP_FIELDS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
+	LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
+	LTTNG_UST_TP_FIELDS(
 		ctf_unused(session)
 	)
 )
 
 #endif /* _TRACEPOINT_LTTNG_UST_STATEDUMP_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-statedump-provider.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng-ust-statedump-provider.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>