X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-pthread-wrapper%2Fust_pthread.h;h=c5d50328d3c565261dbef3fe40e12966e2e687a5;hb=4b01076fea0f635af6af6762a8edce1be03e5d39;hp=18915494d6abfa65f5723603e6d035745f7e9576;hpb=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index 18915494..c5d50328 100644
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2013  Mentor Graphics
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_pthread
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_pthread
 
 #if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_PTHREAD_H
@@ -19,35 +19,35 @@ extern "C" {
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, mutex, mutex)
-		ctf_unused(ip)
+		lttng_ust_field_integer_hex(void *, mutex, mutex)
+		lttng_ust_field_unused(ip)
 	)
 )
 
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, mutex, mutex)
-		ctf_integer(int, status, status)
-		ctf_unused(ip)
+		lttng_ust_field_integer_hex(void *, mutex, mutex)
+		lttng_ust_field_integer(int, status, status)
+		lttng_ust_field_unused(ip)
 	)
 )
 
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, mutex, mutex)
-		ctf_integer(int, status, status)
-		ctf_unused(ip)
+		lttng_ust_field_integer_hex(void *, mutex, mutex)
+		lttng_ust_field_integer(int, status, status)
+		lttng_ust_field_unused(ip)
 	)
 )
 
 LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer_hex(void *, mutex, mutex)
-		ctf_integer(int, status, status)
-		ctf_unused(ip)
+		lttng_ust_field_integer_hex(void *, mutex, mutex)
+		lttng_ust_field_integer(int, status, status)
+		lttng_ust_field_unused(ip)
 	)
 )