Version 2.5.7

[lttng-ust.git] / liblttng-ust-libc-wrapper / lttng-ust-pthread.c

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
index e72b9b40eb357405e601a0b0b69e55c0e5bcbb53..0fb74ed854afa99bf8bb2b9f3d73e900607c6fff 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@ -17,11 +17,12 @@
  */
 
 #define _GNU_SOURCE
-#include <dlfcn.h>
+#include <lttng/ust-dlfcn.h>
 #include <pthread.h>
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
+#define TP_IP_PARAM ip
 #include "ust_pthread.h"
 
 static __thread int thread_in_trace;
@@ -46,9 +47,11 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
        }
 
        thread_in_trace = 1;
-       tracepoint(ust_pthread, pthread_mutex_lock_req, mutex);
+       tracepoint(ust_pthread, pthread_mutex_lock_req, mutex,
+               __builtin_return_address(0));
        retval = mutex_lock(mutex);
-       tracepoint(ust_pthread, pthread_mutex_lock_acq, mutex, retval);
+       tracepoint(ust_pthread, pthread_mutex_lock_acq, mutex, retval,
+               __builtin_return_address(0));
        thread_in_trace = 0;
        return retval;
 }
@@ -74,7 +77,8 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
 
        thread_in_trace = 1;
        retval = mutex_trylock(mutex);
-       tracepoint(ust_pthread, pthread_mutex_trylock, mutex, retval);
+       tracepoint(ust_pthread, pthread_mutex_trylock, mutex, retval,
+               __builtin_return_address(0));
        thread_in_trace = 0;
        return retval;
 }
@@ -100,7 +104,8 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
 
        thread_in_trace = 1;
        retval = mutex_unlock(mutex);
-       tracepoint(ust_pthread, pthread_mutex_unlock, mutex, retval);
+       tracepoint(ust_pthread, pthread_mutex_unlock, mutex, retval,
+               __builtin_return_address(0));
        thread_in_trace = 0;
        return retval;
 }