X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-pthread-wrapper%2Flttng-ust-pthread.c;h=71d21431d69823277f99d04c15c25ba7475c9570;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=c6633fe8592384a0d2b8947270add8775c7de2bc;hpb=3aa28d2301d8b9c1f7eef509e3de42bca2abbffe;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c b/src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c
index c6633fe8..71d21431 100644
--- a/src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c
+++ b/src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c
@@ -16,9 +16,9 @@
 #include "common/macros.h"
 #include <pthread.h>
 
-#define TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM ip
+#define LTTNG_UST_TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TP_IP_PARAM ip
 #include "ust_pthread.h"
 
 static __thread int thread_in_trace;
@@ -43,10 +43,10 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
 	}
 
 	thread_in_trace = 1;
-	tracepoint(lttng_ust_pthread, pthread_mutex_lock_req, mutex,
+	lttng_ust_tracepoint(lttng_ust_pthread, pthread_mutex_lock_req, mutex,
 		LTTNG_UST_CALLER_IP());
 	retval = mutex_lock(mutex);
-	tracepoint(lttng_ust_pthread, pthread_mutex_lock_acq, mutex,
+	lttng_ust_tracepoint(lttng_ust_pthread, pthread_mutex_lock_acq, mutex,
 		retval, LTTNG_UST_CALLER_IP());
 	thread_in_trace = 0;
 	return retval;
@@ -73,7 +73,7 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
 
 	thread_in_trace = 1;
 	retval = mutex_trylock(mutex);
-	tracepoint(lttng_ust_pthread, pthread_mutex_trylock, mutex,
+	lttng_ust_tracepoint(lttng_ust_pthread, pthread_mutex_trylock, mutex,
 		retval, LTTNG_UST_CALLER_IP());
 	thread_in_trace = 0;
 	return retval;
@@ -100,7 +100,7 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
 
 	thread_in_trace = 1;
 	retval = mutex_unlock(mutex);
-	tracepoint(lttng_ust_pthread, pthread_mutex_unlock, mutex,
+	lttng_ust_tracepoint(lttng_ust_pthread, pthread_mutex_unlock, mutex,
 		retval, LTTNG_UST_CALLER_IP());
 	thread_in_trace = 0;
 	return retval;