X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-libc-wrapper%2Fust_libc.h;h=8893fdb77ee9316abdf8c46b304e8dba417bf606;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=b9d74db0ab9a69ba4d0ef717e2d2b5ba451933dd;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;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 b9d74db0..8893fdb7 100644
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -4,8 +4,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_LIBC_H
@@ -19,8 +19,8 @@ extern "C" {
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, malloc,
 	LTTNG_UST_TP_ARGS(size_t, size, void *, ptr, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
 		ctf_unused(ip)
 	)
 )
@@ -28,7 +28,7 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, malloc,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, free,
 	LTTNG_UST_TP_ARGS(void *, ptr, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
 		ctf_unused(ip)
 	)
 )
@@ -36,9 +36,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, free,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, calloc,
 	LTTNG_UST_TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(size_t, nmemb, nmemb)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_integer(size_t, nmemb, nmemb)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
 		ctf_unused(ip)
 	)
 )
@@ -46,9 +46,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, calloc,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, realloc,
 	LTTNG_UST_TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, in_ptr, in_ptr)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
+		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)
 		ctf_unused(ip)
 	)
 )
@@ -56,9 +56,9 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, realloc,
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, memalign,
 	LTTNG_UST_TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(size_t, alignment, alignment)
-		ctf_integer(size_t, size, size)
-		ctf_integer_hex(void *, ptr, ptr)
+		lttng_ust_field_integer(size_t, alignment, alignment)
+		lttng_ust_field_integer(size_t, size, size)
+		lttng_ust_field_integer_hex(void *, ptr, ptr)
 		ctf_unused(ip)
 	)
 )
@@ -66,18 +66,18 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, 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),
 	LTTNG_UST_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)
+		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)
 		ctf_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>