X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Fust_pthread.h;h=7296bf4c0c8614947c033f85cc9e8723a92cd956;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=7d35c3a0e745efb293cd0942326ec7b05d954e56;hpb=600f634aea56e0c003759be5f5e2eb5ac450b742;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/ust_pthread.h b/liblttng-ust-libc-wrapper/ust_pthread.h
index 7d35c3a0..7296bf4c 100644
--- a/liblttng-ust-libc-wrapper/ust_pthread.h
+++ b/liblttng-ust-libc-wrapper/ust_pthread.h
@@ -1,5 +1,11 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2013  Mentor Graphics
+ */
+
 #undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_pthread
+#define TRACEPOINT_PROVIDER lttng_ust_pthread
 
 #if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_PTHREAD_H
@@ -8,55 +14,33 @@
 extern "C" {
 #endif
 
-/*
- * Copyright (C) 2013  Mentor Graphics
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
-	TP_ARGS(pthread_mutex_t *, mutex),
+TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
 	)
 )
 
-TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_acq,
-	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
 		ctf_integer(int, status, status)
 	)
 )
 
-TRACEPOINT_EVENT(ust_pthread, pthread_mutex_trylock,
-	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
 		ctf_integer(int, status, status)
 	)
 )
 
-TRACEPOINT_EVENT(ust_pthread, pthread_mutex_unlock,
-	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
 		ctf_integer(int, status, status)