X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-statedump-provider.h;h=916a356499be0e45d155eede828285dd2b040cf6;hb=8bc1125eb851b2c52d3263c2992e6806017e98e7;hp=e1a2ed78c449b7dfa0b82953ad2c52f26dc198fd;hpb=efa14d169c6336fa8b9f478538ac7968ef9c0338;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 e1a2ed78..916a3564 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,14 +23,14 @@ extern "C" {
 #define LTTNG_UST_STATEDUMP_PROVIDER
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_statedump, start,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, start,
 	LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
+		lttng_ust_field_unused(session)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
 	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
@@ -41,17 +41,17 @@ TRACEPOINT_EVENT(lttng_ust_statedump, bin_info,
 		uint8_t, has_debug_link
 	),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_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_unused(session)
+		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, 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,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
 	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
@@ -59,14 +59,14 @@ TRACEPOINT_EVENT(lttng_ust_statedump, build_id,
 		size_t, build_id_len
 	),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_sequence_hex(uint8_t, build_id, build_id,
+		lttng_ust_field_unused(session)
+		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_statedump, debug_link,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
 	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		void *, baddr,
@@ -74,35 +74,35 @@ TRACEPOINT_EVENT(lttng_ust_statedump, debug_link,
 		uint32_t, crc
 	),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
-		ctf_integer_hex(void *, baddr, baddr)
-		ctf_integer(uint32_t, crc, crc)
-		ctf_string(filename, filename)
+		lttng_ust_field_unused(session)
+		lttng_ust_field_integer_hex(void *, baddr, baddr)
+		lttng_ust_field_integer(uint32_t, crc, crc)
+		lttng_ust_field_string(filename, filename)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, procname,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, procname,
 	LTTNG_UST_TP_ARGS(
 		struct lttng_ust_session *, session,
 		char *, name
 	),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
-		ctf_array_text(char, procname, name, LTTNG_UST_ABI_PROCNAME_LEN)
+		lttng_ust_field_unused(session)
+		lttng_ust_field_array_text(char, procname, name, LTTNG_UST_CONTEXT_PROCNAME_LEN)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_statedump, end,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
 	LTTNG_UST_TP_ARGS(struct lttng_ust_session *, session),
 	LTTNG_UST_TP_FIELDS(
-		ctf_unused(session)
+		lttng_ust_field_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>