From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Seefeld Subject: Re: [PATCH lttng-ust] Add trace instrumentation for some pthread functions. Date: Wed, 4 Sep 2013 10:01:50 -0400 Message-ID: <52273D4E.5050304__31341.0019888126$1378303383$gmane$org@mentor.com> References: <51F9A917.9010509@seefeld.name> <20130803012831.GH9033@Krystal> <51FFAAD7.3000705@seefeld.name> <20130807013159.GG19407@Krystal> <5202482B.2010705@mentor.com> <52025427.5080002@mentor.com> <20130807143346.GA542@Krystal> <520262E8.5010106@mentor.com> <20130807151903.GA1035@Krystal> <52026AD7.7000103@mentor.com> <20130807155228.GC1035@Krystal> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000401080205080007010406" Return-path: Received: from relay1.mentorg.com ([192.94.38.131]) by ltt.polymtl.ca with esmtp (Exim 4.72) (envelope-from ) id 1VHDeg-0002Q9-6c for lttng-dev@lists.lttng.org; Wed, 04 Sep 2013 10:02:04 -0400 In-Reply-To: <20130807155228.GC1035@Krystal> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lttng-dev-bounces@lists.lttng.org To: Mathieu Desnoyers Cc: lttng-dev@lists.lttng.org List-Id: lttng-dev@lists.lttng.org --------------000401080205080007010406 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit 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 > > 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/ --------------000401080205080007010406 Content-Type: text/plain; charset="UTF-8"; name="patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch" >From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Wed, 31 Jul 2013 16:35:31 -0400 Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions. Signed-off-by: Stefan Seefeld Acked-by: Mathieu Desnoyers --- 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 +#include + +#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 + +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 + +#ifdef __cplusplus +} +#endif -- 1.8.3.1 --------------000401080205080007010406 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev --------------000401080205080007010406--