X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-cyg-profile%2Flttng-ust-cyg-profile.h;h=8661163b79c45ae9a96e3a232c403c588e4e59a7;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=8e98237a56513e3cdde0651362e45be536de3121;hpb=18a76df9471a85f29dcf1ed4dbce5e1db5e6e675;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
index 8e98237a..8661163b 100644
--- a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
+++ b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_cyg_profile
 
-#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H
 
 #ifdef __cplusplus
@@ -16,36 +16,36 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
-	TP_ARGS(void *, func_addr, void *, call_site),
-	TP_FIELDS(
-		ctf_integer_hex(unsigned long, addr,
+LTTNG_UST_TRACEPOINT_EVENT_CLASS(lttng_ust_cyg_profile, func_class,
+	LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site),
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer_hex(unsigned long, addr,
 			(unsigned long) func_addr)
-		ctf_integer_hex(unsigned long, call_site,
+		lttng_ust_field_integer_hex(unsigned long, call_site,
 			(unsigned long) call_site)
 	)
 )
 
-TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
+LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
 	func_entry,
-	TP_ARGS(void *, func_addr, void *, call_site)
+	LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )
 
-TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
-	TRACE_DEBUG_FUNCTION)
+LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
+	LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION)
 
-TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
+LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_cyg_profile, func_class,
 	func_exit,
-	TP_ARGS(void *, func_addr, void *, call_site)
+	LTTNG_UST_TP_ARGS(void *, func_addr, void *, call_site)
 )
 
-TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_exit,
-	TRACE_DEBUG_FUNCTION)
+LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_exit,
+	LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION)
 
 #endif /* _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>