X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-pthread.c;h=4875bd003ff77785676d169d88d2bfbcac36ae1b;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=45789aa3463108c72990ad752912309870514a39;hpb=f02baefb3ba4d5493816d63f65625ba4269224d2;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
index 45789aa3..4875bd00 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@ -1,27 +1,21 @@
 /*
- * Copyright (C) 2013  Mentor Graphics
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2013  Mentor Graphics
  */
 
-#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 <helper.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 +40,11 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
 	}
 
 	thread_in_trace = 1;
-	tracepoint(ust_pthread, pthread_mutex_lock_req, mutex);
+	tracepoint(lttng_ust_pthread, pthread_mutex_lock_req, mutex,
+		LTTNG_UST_CALLER_IP());
 	retval = mutex_lock(mutex);
-	tracepoint(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;
 }
@@ -74,7 +70,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(lttng_ust_pthread, pthread_mutex_trylock, mutex,
+		retval, LTTNG_UST_CALLER_IP());
 	thread_in_trace = 0;
 	return retval;
 }
@@ -100,7 +97,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(lttng_ust_pthread, pthread_mutex_unlock, mutex,
+		retval, LTTNG_UST_CALLER_IP());
 	thread_in_trace = 0;
 	return retval;
 }