X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-libc-wrapper%2Fust_libc.h;h=56e9a14d7409aa1aeabd9bf91e995cf5a857ff0f;hb=a9fd951a21f28704ffdfd4217766f725a217208b;hp=c4e7e4bf58c4d849be81fb420cabeb69a201725f;hpb=cadfcbfcd89795086bfeb49af84dadc35154c754;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
index c4e7e4bf..56e9a14d 100644
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_libc
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_libc
 
-#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIBC_H
 
 #ifdef __cplusplus
@@ -16,68 +16,68 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_libc, malloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, malloc,
 	LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
-	TP_FIELDS(
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_unused(ip)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, free,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, free,
 	LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
-	TP_FIELDS(
-		ctf_integer_hex(void *, ptr, ptr)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_unused(ip)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, calloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, calloc,
 	LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
-	TP_FIELDS(
-		ctf_integer(size_t, nmemb, nmemb)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(size_t, nmemb, nmemb)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_unused(ip)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, realloc,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, realloc,
 	LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
-	TP_FIELDS(
-		ctf_integer_hex(void *, in_ptr, in_ptr)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer_hex(void *, in_ptr, in_ptr)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_unused(ip)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, memalign,
 	LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
-	TP_FIELDS(
-		ctf_integer(size_t, alignment, alignment)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(size_t, alignment, alignment)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_unused(ip)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
 	LTTNG_UST_TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
-	TP_FIELDS(
-		ctf_integer_hex(void *, out_ptr, out_ptr)
-		ctf_integer(size_t, alignment, alignment)
-		ctf_integer(size_t, size, size)
-		ctf_integer(int, result, result)
-		ctf_unused(ip)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer_hex(void *, out_ptr, out_ptr)
+		lttng_ust_field_integer(size_t, alignment, alignment)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer(int, result, result)
+		lttng_ust_field_unused(ip)
 	)
 )
 
 #endif /* _TRACEPOINT_UST_LIBC_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_libc.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_libc.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>