projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sync event enablers before choosing header type
[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 97e3eb88a4ba37328b9fd1c63b25c9cd3f56d28e..7836ffa02175d7599e4472403964b1b1069f4c33 100644
(file)
--- a/
liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/
liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@
-17,11
+17,18
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+/*
+ * Do _not_ define _LGPL_SOURCE because we don't want to create a
+ * circular dependency loop between this malloc wrapper, liburcu and
+ * libc.
+ */
#include <lttng/ust-dlfcn.h>
#include <lttng/ust-dlfcn.h>
+#include <helper.h>
#include <pthread.h>
#define TRACEPOINT_DEFINE
#define TRACEPOINT_CREATE_PROBES
#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;
#include "ust_pthread.h"
static __thread int thread_in_trace;
@@
-46,9
+53,11
@@
int pthread_mutex_lock(pthread_mutex_t *mutex)
}
thread_in_trace = 1;
}
thread_in_trace = 1;
- tracepoint(lttng_ust_pthread, pthread_mutex_lock_req, mutex);
+ tracepoint(lttng_ust_pthread, pthread_mutex_lock_req, mutex,
+ LTTNG_UST_CALLER_IP());
retval = mutex_lock(mutex);
retval = mutex_lock(mutex);
- tracepoint(lttng_ust_pthread, pthread_mutex_lock_acq, mutex, retval);
+ tracepoint(lttng_ust_pthread, pthread_mutex_lock_acq, mutex,
+ retval, LTTNG_UST_CALLER_IP());
thread_in_trace = 0;
return retval;
}
thread_in_trace = 0;
return retval;
}
@@
-74,7
+83,8
@@
int pthread_mutex_trylock(pthread_mutex_t *mutex)
thread_in_trace = 1;
retval = mutex_trylock(mutex);
thread_in_trace = 1;
retval = mutex_trylock(mutex);
- tracepoint(lttng_ust_pthread, pthread_mutex_trylock, mutex, retval);
+ tracepoint(lttng_ust_pthread, pthread_mutex_trylock, mutex,
+ retval, LTTNG_UST_CALLER_IP());
thread_in_trace = 0;
return retval;
}
thread_in_trace = 0;
return retval;
}
@@
-100,7
+110,8
@@
int pthread_mutex_unlock(pthread_mutex_t *mutex)
thread_in_trace = 1;
retval = mutex_unlock(mutex);
thread_in_trace = 1;
retval = mutex_unlock(mutex);
- tracepoint(lttng_ust_pthread, pthread_mutex_unlock, mutex, retval);
+ tracepoint(lttng_ust_pthread, pthread_mutex_unlock, mutex,
+ retval, LTTNG_UST_CALLER_IP());
thread_in_trace = 0;
return retval;
}
thread_in_trace = 0;
return retval;
}
This page took
0.025904 seconds
and
4
git commands to generate.