Re: [PATCH lttng-ust] Add trace instrumentation for some pthread functions.

[Mathieu Desnoyers <mathieu.desnoyers@efficios.com>]

Merged, thanks !

Mathieu

* Stefan Seefeld (stefan_seefeld@mentor.com) wrote:
> On 2013-08-07 11:52, Mathieu Desnoyers wrote:
> > * Stefan Seefeld (stefan_seefeld@mentor.com) wrote:
> >> Sorry for the incomplete patch. Here is a corrected one.
> >>
> >> 	Stefan
> > 
> > You can add my
> > 
> > Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> > 
> > To you patch changelog.
> > 
> > Can you keep it around and resubmit after we release 2.3-final in a few
> > weeks ?
> 
> Mathieu,
> 
> please find attached the patch again.
> 
> Thanks,
> 		Stefan
> 
> 
> -- 
> Stefan Seefeld
> CodeSourcery / Mentor Graphics
> http://www.mentor.com/embedded-software/

> From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001
> From: Stefan Seefeld <stefan_seefeld@mentor.com>
> Date: Wed, 31 Jul 2013 16:35:31 -0400
> Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.
> 
> Signed-off-by: Stefan Seefeld <stefan_seefeld@mentor.com>
> Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> ---
>  liblttng-ust-libc-wrapper/Makefile.am         |  12 ++-
>  liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 106 ++++++++++++++++++++++++++
>  liblttng-ust-libc-wrapper/ust_libc.h          |  10 +--
>  liblttng-ust-libc-wrapper/ust_pthread.h       |  76 ++++++++++++++++++
>  4 files changed, 198 insertions(+), 6 deletions(-)
>  create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
>  create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
> 
> diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
> index 4fdcedb..d402d53 100644
> --- a/liblttng-ust-libc-wrapper/Makefile.am
> +++ b/liblttng-ust-libc-wrapper/Makefile.am
> @@ -1,7 +1,8 @@
>  AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
>  AM_CFLAGS = -fno-strict-aliasing
>  
> -lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la
> +lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la \
> +  liblttng-ust-pthread-wrapper.la
>  liblttng_ust_libc_wrapper_la_SOURCES = \
>  	lttng-ust-malloc.c \
>  	ust_libc.h
> @@ -9,11 +10,20 @@ liblttng_ust_libc_wrapper_la_LIBADD = \
>  	-L$(top_builddir)/liblttng-ust/.libs \
>  	-llttng-ust
>  
> +liblttng_ust_pthread_wrapper_la_SOURCES = \
> +	lttng-ust-pthread.c \
> +	ust_pthread.h
> +liblttng_ust_pthread_wrapper_la_LIBADD = \
> +	-L$(top_builddir)/liblttng-ust/.libs \
> +	-llttng-ust
> +
>  if LTTNG_UST_BUILD_WITH_LIBDL
>  liblttng_ust_libc_wrapper_la_LIBADD += -ldl
> +liblttng_ust_pthread_wrapper_la_LIBADD += -ldl
>  endif
>  if LTTNG_UST_BUILD_WITH_LIBC_DL
>  liblttng_ust_libc_wrapper_la_LIBADD += -lc
> +liblttng_ust_pthread_wrapper_la_LIBADD += -lc
>  endif
>  
>  noinst_SCRIPTS = run
> diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
> new file mode 100644
> index 0000000..e72b9b4
> --- /dev/null
> +++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
> @@ -0,0 +1,106 @@
> +/*
> + * 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.
> + *
> + * 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
> + */
> +
> +#define _GNU_SOURCE
> +#include <dlfcn.h>
> +#include <pthread.h>
> +
> +#define TRACEPOINT_DEFINE
> +#define TRACEPOINT_CREATE_PROBES
> +#include "ust_pthread.h"
> +
> +static __thread int thread_in_trace;
> +
> +int pthread_mutex_lock(pthread_mutex_t *mutex)
> +{
> +	static int (*mutex_lock)(pthread_mutex_t *);
> +	int retval;
> +
> +	if (!mutex_lock) {
> +		mutex_lock = dlsym(RTLD_NEXT, "pthread_mutex_lock");
> +		if (!mutex_lock) {
> +			if (thread_in_trace) {
> +				abort();
> +			}
> +			fprintf(stderr, "unable to initialize pthread wrapper library.\n");
> +			return EINVAL;
> +		}
> +	}
> +	if (thread_in_trace) {
> +		return mutex_lock(mutex);
> +	}
> +
> +	thread_in_trace = 1;
> +	tracepoint(ust_pthread, pthread_mutex_lock_req, mutex);
> +	retval = mutex_lock(mutex);
> +	tracepoint(ust_pthread, pthread_mutex_lock_acq, mutex, retval);
> +	thread_in_trace = 0;
> +	return retval;
> +}
> +
> +int pthread_mutex_trylock(pthread_mutex_t *mutex)
> +{
> +	static int (*mutex_trylock)(pthread_mutex_t *);
> +	int retval;
> +
> +	if (!mutex_trylock) {
> +		mutex_trylock = dlsym(RTLD_NEXT, "pthread_mutex_trylock");
> +		if (!mutex_trylock) {
> +			if (thread_in_trace) {
> +				abort();
> +			}
> +			fprintf(stderr, "unable to initialize pthread wrapper library.\n");
> +			return EINVAL;
> +		}
> +	}
> +	if (thread_in_trace) {
> +		return mutex_trylock(mutex);
> +	}
> +
> +	thread_in_trace = 1;
> +	retval = mutex_trylock(mutex);
> +	tracepoint(ust_pthread, pthread_mutex_trylock, mutex, retval);
> +	thread_in_trace = 0;
> +	return retval;
> +}
> +
> +int pthread_mutex_unlock(pthread_mutex_t *mutex)
> +{
> +	static int (*mutex_unlock)(pthread_mutex_t *);
> +	int retval;
> +
> +	if (!mutex_unlock) {
> +		mutex_unlock = dlsym(RTLD_NEXT, "pthread_mutex_unlock");
> +		if (!mutex_unlock) {
> +			if (thread_in_trace) {
> +				abort();
> +			}
> +			fprintf(stderr, "unable to initialize pthread wrapper library.\n");
> +			return EINVAL;
> +		}
> +	}
> +	if (thread_in_trace) {
> +		return mutex_unlock(mutex);
> +	}
> +
> +	thread_in_trace = 1;
> +	retval = mutex_unlock(mutex);
> +	tracepoint(ust_pthread, pthread_mutex_unlock, mutex, retval);
> +	thread_in_trace = 0;
> +	return retval;
> +}
> diff --git a/liblttng-ust-libc-wrapper/ust_pthread.h b/liblttng-ust-libc-wrapper/ust_pthread.h
> new file mode 100644
> index 0000000..7d35c3a
> --- /dev/null
> +++ b/liblttng-ust-libc-wrapper/ust_pthread.h
> @@ -0,0 +1,76 @@
> +#undef TRACEPOINT_PROVIDER
> +#define TRACEPOINT_PROVIDER ust_pthread
> +
> +#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
> +#define _TRACEPOINT_UST_PTHREAD_H
> +
> +#ifdef __cplusplus
> +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),
> +	TP_FIELDS(
> +		ctf_integer_hex(void *, mutex, mutex)
> +	)
> +)
> +
> +TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_acq,
> +	TP_ARGS(pthread_mutex_t *, mutex, int, status),
> +	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),
> +	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),
> +	TP_FIELDS(
> +		ctf_integer_hex(void *, mutex, mutex)
> +		ctf_integer(int, status, status)
> +	)
> +)
> +
> +#endif /* _TRACEPOINT_UST_PTHREAD_H */
> +
> +#undef TRACEPOINT_INCLUDE
> +#define TRACEPOINT_INCLUDE "./ust_pthread.h"
> +
> +/* This part must be outside ifdef protection */
> +#include <lttng/tracepoint-event.h>
> +
> +#ifdef __cplusplus
> +}
> +#endif
> -- 
> 1.8.3.1
> 


-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com