Skip to contentSkip to conversation

Add trace instrumentation for some pthread functions.

PATCH Applied Jérémie Galarneau 4 participants 21 messages Jul 31, 2013 – Sep 18, 2013 19 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi Stefan,

Please inline your patches in the future as it makes the review process simpler. There are a number of stylistic problems, mostly misplaced braces.

You can run your patches through the checkpatch.pl script found in lttng-tools/extras. It will spot most coding-style related problems right away.

Also, I think lttng-ust-pthread-mutex.c may be a more appropriate name than pthread.c

Thanks,
Jérémie

Quoted 17 lines · Stefan Seefeld

The attached patch introduces a pthread wrapper library with initial instrumentation for pthread_mutex_lock, pthread_mutex_trylock, and pthread_mutex_unlock.
New tracepoints are introduced for each of those. For the lock function, two distinct tracepoints are emitted: one before the lock is requested, another after it has been acquired.

--
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): CA+jJMxsoH8Rz6fwZJOPnG-4xvB2w8GO5eqi0JDtHUy7iM-n2WA@mail.gmail.com

#3 lore raw
Quoted 8 lines · Jérémie Galarneau

Hi Stefan,

Please inline your patches in the future as it makes the review process simpler. There are a number of stylistic problems, mostly misplaced braces.

You can run your patches through the checkpatch.pl script found in lttng-tools/extras. It will spot most coding-style related problems right away.

OK, will do, once the patch is approved functionally.

Quoted 2 lines

Also, I think lttng-ust-pthread-mutex.c may be a more appropriate name than pthread.c

Wouldn't that just be redundant ? (And I actually expect the file to grow instrumentation that's not mutex-specific.)

Thanks,
Stefan

Signature · 1 line
      ...ich hab' noch einen Koffer in Berlin...

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 10 lines · Stefan Seefeld
Quoted 8 lines · Jérémie Galarneau

Hi Stefan,

Please inline your patches in the future as it makes the review process simpler. There are a number of stylistic problems, mostly misplaced braces.

You can run your patches through the checkpatch.pl script found in lttng-tools/extras. It will spot most coding-style related problems right away.

Quoted 7 lines

OK, will do, once the patch is approved functionally.

Quoted 2 lines

Also, I think lttng-ust-pthread-mutex.c may be a more appropriate name than pthread.c

Wouldn't that just be redundant ? (And I actually expect the file to grow instrumentation that's not mutex-specific.)

I'd keep the file name in line with what's already there, namely lttng-ust-malloc.c.
If you plan on instrumenting other parts of the pthread API, lttng-ust-pthread.c would make sense.

Quoted 13 lines

Thanks,
Stefan

--

...ich hab' noch einen Koffer in Berlin...

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
#6 lore raw
In reply to a message not in the archive
Quoted 11 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 8 lines · Jérémie Galarneau

Hi Stefan,

Please inline your patches in the future as it makes the review process simpler. There are a number of stylistic problems, mostly misplaced braces.

You can run your patches through the checkpatch.pl script found in lttng-tools/extras. It will spot most coding-style related problems right away.

OK, will do, once the patch is approved functionally.

Jeremie is right: incorrect coding style makes the review process harder for us. Once the coding style is right, we can do the functional review of the patch more efficiently.

Please resubmit after coding style fixes.

Thanks,

Mathieu

Quoted 19 lines
Quoted 3 lines

Also, I think lttng-ust-pthread-mutex.c may be a more appropriate name than pthread.c

Wouldn't that just be redundant ? (And I actually expect the file to grow instrumentation that's not mutex-specific.)

Thanks,
Stefan

Signature · 7 lines
      ...ich hab' noch einen Koffer in Berlin...


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): CA+jJMxv4oS0SbMqUF247jS0s0E+6DfdepNT8yHimY=TULHD+tQ@mail.gmail.com

#8 lore raw
Quoted 16 lines · * Jérémie Galarneau ([email protected]) wrote:
Quoted 15 lines · Stefan Seefeld
Quoted 8 lines · Jérémie Galarneau

Hi Stefan,

Please inline your patches in the future as it makes the review process simpler. There are a number of stylistic problems, mostly misplaced braces.

You can run your patches through the checkpatch.pl script found in lttng-tools/extras. It will spot most coding-style related problems right away.

OK, will do, once the patch is approved functionally.

Quoted 2 lines

Also, I think lttng-ust-pthread-mutex.c may be a more appropriate name than pthread.c

Quoted 7 lines
Quoted 2 lines

Wouldn't that just be redundant ? (And I actually expect the file to grow instrumentation that's not mutex-specific.)

I'd keep the file name in line with what's already there, namely lttng-ust-malloc.c.
If you plan on instrumenting other parts of the pthread API, lttng-ust-pthread.c would make sense.

Agreed.

Mathieu

Quoted 26 lines
Quoted 14 lines

Thanks,
Stefan

--

...ich hab' noch einen Koffer in Berlin...

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 8 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130803012831.GH9033@Krystal

#10 lore raw
Quoted 5 lines · Mathieu Desnoyers

Jeremie is right: incorrect coding style makes the review process harder for us. Once the coding style is right, we can do the functional review of the patch more efficiently.

Please resubmit after coding style fixes.

See attached.

Stefan

Signature · 1 line
      ...ich hab' noch einen Koffer in Berlin...

From cc39cdfbfca6d13121270eb9da3aed97be65586c Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 liblttng-ust-libc-wrapper/Makefile.am         | 12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 91 +++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_pthread.h       | 76 ++++++++++++++++++++++
 3 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +91 -0

91 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#12 lore raw
Quoted 8 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 5 lines · Mathieu Desnoyers

Jeremie is right: incorrect coding style makes the review process harder for us. Once the coding style is right, we can do the functional review of the patch more efficiently.

Please resubmit after coding style fixes.

See attached.

Thanks,

Please beware that we're not pulling new features during the -rc cycle. When the patch is deemed ready, it will be good to keep it around for submission after 2.3-final is released.

comments inlined below,

Quoted 85 lines

Stefan

Signature · 16 lines
      ...ich hab' noch einen Koffer in Berlin...


From cc39cdfbfca6d13121270eb9da3aed97be65586c Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

Signed-off-by: Stefan Seefeld <[email protected]>
---
 liblttng-ust-libc-wrapper/Makefile.am         | 12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 91 +++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_pthread.h       | 76 ++++++++++++++++++++++
 3 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +21 -0
new file mode 100644
index 0000000..98ce9bf
@@ -0,0 +1,91 @@
+/*
+ * 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>

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 31

Quoted 10 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +10 -0
+
+#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 *);

please add newline.

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 35

Quoted 4 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +4 -0
+	if (!mutex_lock) {
+		mutex_lock = dlsym(RTLD_NEXT, "pthread_mutex_lock");
+		if (!mutex_lock) {
+			fprintf(stderr, "unable to initialize pthread wrapper library.\n");

is it possible that fprintf calls pthread_mutex_lock at some point ? If so, this should be surrounded within thread_in_trace check.

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 42

Quoted 7 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +7 -0
+			return EINVAL;
+		}
+	}
+	if (!thread_in_trace) {
+		thread_in_trace = 1;
+		tracepoint(ust_pthread, pthread_mutex_lock_req, mutex);
+		int retval = mutex_lock(mutex);

please avoid declaring a variable with code. Always do so at the beginning of a block.

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 48

Quoted 6 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +6 -0
+		tracepoint(ust_pthread, pthread_mutex_lock_acq, mutex, retval);
+		thread_in_trace = 0;
+		return retval;
+	} else {
+		return mutex_lock(mutex);
+	}

I'd prefer something like:

        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;

so we can remove a level of indentation by only putting the special-cases at the beginning in the if (with a return within the true block).

Similar comments apply throughout this patch.

Quoted 77 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +43 -0
+}
+
+int pthread_mutex_trylock(pthread_mutex_t *mutex)
+{
+	static int (*mutex_trylock)(pthread_mutex_t *);
+	if (!mutex_trylock) {
+		mutex_trylock = dlsym(RTLD_NEXT, "pthread_mutex_trylock");
+		if (!mutex_trylock) {
+			fprintf(stderr, "unable to initialize pthread wrapper library.\n");
+			return EINVAL;
+		}
+	}
+	if (!thread_in_trace) {
+		thread_in_trace = 1;
+		int retval = mutex_trylock(mutex);
+		tracepoint(ust_pthread, pthread_mutex_trylock, mutex, retval);
+		thread_in_trace = 0;
+		return retval;
+	} else {
+		return mutex_trylock(mutex);
+	}
+}
+
+int pthread_mutex_unlock(pthread_mutex_t *mutex)
+{
+	static int (*mutex_unlock)(pthread_mutex_t *);
+	if (!mutex_unlock) {
+		mutex_unlock = dlsym(RTLD_NEXT, "pthread_mutex_unlock");
+		if (!mutex_unlock) {
+			fprintf(stderr, "unable to initialize pthread wrapper library.\n");
+			return EINVAL;
+		}
+	}
+	if (!thread_in_trace) {
+		thread_in_trace = 1;
+		int retval = mutex_unlock(mutex);
+		tracepoint(ust_pthread, pthread_mutex_unlock, mutex, retval);
+		thread_in_trace = 0;
+		return retval;
+	} else {
+		return mutex_unlock(mutex);
+	}
+}
liblttng-ust-libc-wrapper/ust_pthread.h new file +28 -0
new file mode 100644
index 0000000..86275b7
@@ -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,

liblttng-ust-libc-wrapper/ust_pthread.h line 38

Quoted 10 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +10 -0
+ * 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(unsigned long, mutex, (unsigned long) mutex)

I'm curious (and I honestly don't remember): does it work if we put "void *" as type rather than "unsigned long" here ?

Thanks,

Mathieu

Quoted 41 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +38 -0
+	)
+)
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_acq,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+	TP_FIELDS(
+		ctf_integer_hex(unsigned long, mutex, (unsigned long) 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(unsigned long, mutex, (unsigned long) 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(unsigned long, mutex, (unsigned long) 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
Signature · 1 line
1.8.3.1
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807013159.GG19407@Krystal

#14 lore raw

Mathieu,

please find attached a revised patch.

Quoted 9 lines · Mathieu Desnoyers
(quoted diff) +6 -0
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex),
+	TP_FIELDS(
+		ctf_integer_hex(unsigned long, mutex, (unsigned long) mutex)

I'm curious (and I honestly don't remember): does it work if we put "void *" as type rather than "unsigned long" here ?

It seems to work fine - I applied the suggested change (see the current patch) and I see the same traces.

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 6fb45b78dd60045631d3e8e6dab6dd838d9db869 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 liblttng-ust-libc-wrapper/Makefile.am         | 12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 97 +++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_pthread.h       | 76 +++++++++++++++++++++
 3 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +97 -0

97 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#16 lore raw
Quoted 5 lines · Stefan Seefeld

Mathieu,

please find attached a revised patch.

On 08/06/2013 09:32 PM, Mathieu Desnoyers wrote:

Quoted 10 lines
Quoted 8 lines
(quoted diff) +6 -0
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex),
+	TP_FIELDS(
+		ctf_integer_hex(unsigned long, mutex, (unsigned long) mutex)

I'm curious (and I honestly don't remember): does it work if we put "void *" as type rather than "unsigned long" here ?

It seems to work fine - I applied the suggested change (see the current patch) and I see the same traces.

Sorry, the patch was incomplete. Here is the complete one (including the revised ust_pthread.h code.

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 204a0821918ee826a19ad3e01d1ada69d9ece395 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 liblttng-ust-libc-wrapper/Makefile.am         | 12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 97 +++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_pthread.h       | 76 +++++++++++++++++++++
 3 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +97 -0

97 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#18 lore raw
Quoted 17 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 5 lines · Stefan Seefeld

Mathieu,

please find attached a revised patch.

On 08/06/2013 09:32 PM, Mathieu Desnoyers wrote:

Quoted 10 lines
Quoted 8 lines
(quoted diff) +6 -0
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex),
+	TP_FIELDS(
+		ctf_integer_hex(unsigned long, mutex, (unsigned long) mutex)

I'm curious (and I honestly don't remember): does it work if we put "void *" as type rather than "unsigned long" here ?

It seems to work fine - I applied the suggested change (see the current patch) and I see the same traces.

Quoted 2 lines

Sorry, the patch was incomplete. Here is the complete one (including the revised ust_pthread.h code.

We're getting close with this patch, still a few questions below.

Quoted 90 lines

Stefan

Signature · 18 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/


From 204a0821918ee826a19ad3e01d1ada69d9ece395 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

Signed-off-by: Stefan Seefeld <[email protected]>
---
 liblttng-ust-libc-wrapper/Makefile.am         | 12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 97 +++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_pthread.h       | 76 +++++++++++++++++++++
 3 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +26 -0
new file mode 100644
index 0000000..53230e1
@@ -0,0 +1,97 @@
+/*
+ * 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"
+

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 36

Quoted 10 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +10 -0
+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 && !thread_in_trace) {

I'd rather see:

                if (!mutex_lock) {
                        if (thread_in_trace) {
                                abort();
                        }
                        fprintf(stderr, "unable to initialize pthread wrapper library.\n");
                        return EINVAL;
                }

because in that situation, there is not much we can do anyway.

Quoted 95 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +61 -0
+			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 && !thread_in_trace) {
+			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 && !thread_in_trace) {
+			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;
+}
liblttng-ust-libc-wrapper/ust_pthread.h new file +28 -0
new file mode 100644
index 0000000..a1be974
@@ -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,

liblttng-ust-libc-wrapper/ust_pthread.h line 38

Quoted 10 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +10 -0
+ * 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, (void *) mutex)

I think the (void *) cast can be removed here: an implicit cast from pthread_mutex_t * to void * should be fine.

Thanks,

Mathieu

Quoted 46 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +38 -0
+	)
+)
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_acq,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+	TP_FIELDS(
+		ctf_integer_hex(void *, mutex, (void *) 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, (void *) 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, (void *) 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
Signature · 7 lines
1.8.3.1


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807143346.GA542@Krystal

#20 lore raw
Quoted 21 lines · Mathieu Desnoyers

Review

Quoted 9 lines · * Stefan Seefeld ([email protected]) wrote:
(quoted diff) +8 -0
+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 && !thread_in_trace) {

I'd rather see:

                if (!mutex_lock) {
                        if (thread_in_trace) {
                                abort();
                        }
                        fprintf(stderr, "unable to initialize pthread wrapper library.\n");
                        return EINVAL;
                }
Quoted 1 line

because in that situation, there is not much we can do anyway.

Agreed.

Quoted 6 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex),
+	TP_FIELDS(
+		ctf_integer_hex(void *, mutex, (void *) mutex)

I think the (void *) cast can be removed here: an implicit cast from pthread_mutex_t * to void * should be fine.

Adjusted.

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 5ad78c8b7c24d2c96e55739de32fbf9a353edd9f Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 liblttng-ust-libc-wrapper/Makefile.am         |  12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 100 ++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_libc.h          |  10 +--
 liblttng-ust-libc-wrapper/ust_pthread.h       |  76 ++++++++++++++++++++
 4 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +100 -0

100 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#22 lore raw
Quoted 152 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 21 lines · Mathieu Desnoyers

Review

Quoted 9 lines · * Stefan Seefeld ([email protected]) wrote:
(quoted diff) +8 -0
+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 && !thread_in_trace) {

I'd rather see:

                if (!mutex_lock) {
                        if (thread_in_trace) {
                                abort();
                        }
                        fprintf(stderr, "unable to initialize pthread wrapper library.\n");
                        return EINVAL;
                }
Quoted 1 line

because in that situation, there is not much we can do anyway.

Agreed.

Quoted 6 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_req,
+	TP_ARGS(pthread_mutex_t *, mutex),
+	TP_FIELDS(
+		ctf_integer_hex(void *, mutex, (void *) mutex)

I think the (void *) cast can be removed here: an implicit cast from pthread_mutex_t * to void * should be fine.

Adjusted.

Stefan

Signature · 19 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/


From 5ad78c8b7c24d2c96e55739de32fbf9a353edd9f Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

Signed-off-by: Stefan Seefeld <[email protected]>
---
 liblttng-ust-libc-wrapper/Makefile.am         |  12 +++-
 liblttng-ust-libc-wrapper/lttng-ust-pthread.c | 100 ++++++++++++++++++++++++++
 liblttng-ust-libc-wrapper/ust_libc.h          |  10 +--
 liblttng-ust-libc-wrapper/ust_pthread.h       |  76 ++++++++++++++++++++
 4 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 liblttng-ust-libc-wrapper/lttng-ust-pthread.c
 create mode 100644 liblttng-ust-libc-wrapper/ust_pthread.h
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +53 -0
new file mode 100644
index 0000000..fff073e
@@ -0,0 +1,100 @@
+/*
+ * 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;

liblttng-ust-libc-wrapper/lttng-ust-pthread.c line 63

Quoted 10 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +10 -0
+}
+
+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 && !thread_in_trace) {

I think you forgot to apply the abort() trick everywhere.

Quoted 71 lines
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +37 -0
+			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 && !thread_in_trace) {
+			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;
+}
liblttng-ust-libc-wrapper/ust_pthread.h new file +28 -0
new file mode 100644
index 0000000..a1be974
@@ -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,

liblttng-ust-libc-wrapper/ust_pthread.h line 38

Quoted 10 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +10 -0
+ * 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, (void *) mutex)

The explicit cast is still there. You possibly forgot to refresh your patch.

Thanks,

Mathieu

Quoted 46 lines
liblttng-ust-libc-wrapper/ust_pthread.h new file +38 -0
+	)
+)
+
+TRACEPOINT_EVENT(ust_pthread, pthread_mutex_lock_acq,
+	TP_ARGS(pthread_mutex_t *, mutex, int, status),
+	TP_FIELDS(
+		ctf_integer_hex(void *, mutex, (void *) 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, (void *) 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, (void *) 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
Signature · 7 lines
1.8.3.1


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807151903.GA1035@Krystal

#24 lore raw

Sorry for the incomplete patch. Here is a corrected one.

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 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
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +106 -0

106 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#26 lore raw
Quoted 3 lines · * Stefan Seefeld ([email protected]) wrote:

Sorry for the incomplete patch. Here is a corrected one.

Stefan

You can add my

To you patch changelog.

Can you keep it around and resubmit after we release 2.3-final in a few weeks ?

Thanks,

Mathieu

Quoted 254 lines
Signature · 19 lines
-- 
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

Signed-off-by: Stefan Seefeld <[email protected]>
---
 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
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +106 -0
new file mode 100644
index 0000000..e72b9b4
@@ -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;
+}
liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0
new file mode 100644
index 0000000..7d35c3a
@@ -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
Signature · 1 line
1.8.3.1
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807155228.GC1035@Krystal

#28 lore raw
Quoted 4 lines · Mathieu Desnoyers
Quoted 3 lines · * Stefan Seefeld ([email protected]) wrote:

Sorry for the incomplete patch. Here is a corrected one.

Stefan

Quoted 8 lines

You can add my

To you patch changelog.

Can you keep it around and resubmit after we release 2.3-final in a few weeks ?

Why can't this be comitted to a devel branch, if it isn't fit to go into master ? (Also, does this imply that the malloc patch made it into the 2.3 release ?)

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

A message that is not in the archive (sent off-list or not yet received): [email protected]

#30 lore raw
Quoted 9 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 8 lines · Mathieu Desnoyers
Quoted 3 lines · * Stefan Seefeld ([email protected]) wrote:

Sorry for the incomplete patch. Here is a corrected one.

Stefan

You can add my

Quoted 7 lines
Quoted 4 lines

To you patch changelog.

Can you keep it around and resubmit after we release 2.3-final in a few weeks ?

Why can't this be comitted to a devel branch, if it isn't fit to go into master ?

Because master is currently in feature freeze for the 2.3-rc cycle, and as a maintainer I'm not keeping any devel/staging branch: this responsibility currently belongs to the contributors. The new features flow into master between the end of the release candidate cycle (final version) and the start of the next rc cycle. See the recent discussion on the release process on lttng-dev for more details. Feedback is welcome.

Quoted 2 lines

(Also, does this imply that the malloc patch made it into the 2.3 release ?)

Yes, the malloc patch made it into the 2.3 release mainly because it's fixing incomplete coverage of the already existing malloc/free-related instrumentation.

The difference with pthread instrumentation is that it's really a new feature in every possible sense of the term: new kind of library functions are instrumented, new problems may arise, new files are added, new shared objects are added. This is exactly what we don't want to add during rc.

Please note that as soon as you get my acked-by, you can consider this patch accepted. It's just that we don't have the staging branches to keep them around, nor the manpower to maintain a 3rd branch in parallel with the current stable+rc.

Thoughts ?

Thanks,

Mathieu

Quoted 14 lines

Stefan

Signature · 9 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807161241.GB1336@Krystal

#32 lore raw
Quoted 5 lines · Mathieu Desnoyers

The difference with pthread instrumentation is that it's really a new feature in every possible sense of the term: new kind of library functions are instrumented, new problems may arise, new files are added, new shared objects are added. This is exactly what we don't want to add during rc.

I fully agree.

Quoted 6 lines

Please note that as soon as you get my acked-by, you can consider this patch accepted. It's just that we don't have the staging branches to keep them around, nor the manpower to maintain a 3rd branch in parallel with the current stable+rc.

Thoughts ?

I understand if it makes things easier for you as maintainer if you ask contributors to do the rebase before their (approved) patches are to be merged. But your wording seemed to suggest that I should resend the actual patch, not regenerate it after rebasing to a future master, which confused me as in that case I'd need to keep around a free-floating patch that is neither version-controlled nor archived.

Stefan

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

A message that is not in the archive (sent off-list or not yet received): [email protected]

#34 lore raw
Quoted 15 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 5 lines · Mathieu Desnoyers

The difference with pthread instrumentation is that it's really a new feature in every possible sense of the term: new kind of library functions are instrumented, new problems may arise, new files are added, new shared objects are added. This is exactly what we don't want to add during rc.

I fully agree.

Quoted 5 lines

Please note that as soon as you get my acked-by, you can consider this patch accepted. It's just that we don't have the staging branches to keep them around, nor the manpower to maintain a 3rd branch in parallel with the current stable+rc.

Quoted 8 lines
Quoted 1 line

Thoughts ?

I understand if it makes things easier for you as maintainer if you ask contributors to do the rebase before their (approved) patches are to be merged. But your wording seemed to suggest that I should resend the actual patch, not regenerate it after rebasing to a future master, which confused me as in that case I'd need to keep around a free-floating patch that is neither version-controlled nor archived.

I'm OK with contributors rebasing a patch before resubmission, of course. However, if the rebase required any change at all to the patch, the "acked-by" tags should be removed, and the fact that it's been accepted and then rebased (with changes) should be pointed out in the changelog, ideally with a quick summary of the changes required for the rebase. This should make the merge process quick and straightforward, without risks of us missing an issue introduced by the rebase.

Does it make sense ?

Thanks,

Mathieu

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130807163153.GA2194@Krystal

#36 lore raw
Quoted 23 lines · Mathieu Desnoyers
Quoted 7 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 5 lines · Mathieu Desnoyers

Please note that as soon as you get my acked-by, you can consider this patch accepted. It's just that we don't have the staging branches to keep them around, nor the manpower to maintain a 3rd branch in parallel with the current stable+rc.

Quoted 7 lines
Quoted 1 line

Thoughts ?

I understand if it makes things easier for you as maintainer if you ask contributors to do the rebase before their (approved) patches are to be merged. But your wording seemed to suggest that I should resend the actual patch, not regenerate it after rebasing to a future master, which confused me as in that case I'd need to keep around a free-floating patch that is neither version-controlled nor archived.

I'm OK with contributors rebasing a patch before resubmission, of course. However, if the rebase required any change at all to the patch, the "acked-by" tags should be removed, and the fact that it's been accepted and then rebased (with changes) should be pointed out in the changelog, ideally with a quick summary of the changes required for the rebase. This should make the merge process quick and straightforward, without risks of us missing an issue introduced by the rebase.

Quoted 1 line

Does it make sense ?

OK. You are right, the patch may not actually require any change, given that it's (mostly) new files.

Thanks,
Stefan

Signature · 1 line
      ...ich hab' noch einen Koffer in Berlin...
Acked-by Mathieu Desnoyers
#37 lore raw
In reply to a message not in the archive
Quoted 5 lines · Mathieu Desnoyers
Quoted 3 lines · * Stefan Seefeld ([email protected]) wrote:

Sorry for the incomplete patch. Here is a corrected one.

Stefan

Quoted 8 lines

You can add my

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

Signature · 3 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

---
 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
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +106 -0

106 lines not on this page · raw message

liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0

76 lines not on this page · raw message

Signature · 1 line
1.8.3.1

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#39 lore raw

Merged, thanks !

Mathieu

Quoted 276 lines · * Stefan Seefeld ([email protected]) wrote:
Quoted 5 lines · Mathieu Desnoyers
Quoted 3 lines · * Stefan Seefeld ([email protected]) wrote:

Sorry for the incomplete patch. Here is a corrected one.

Stefan

Quoted 8 lines

You can add my

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

Signature · 19 lines
Stefan Seefeld
CodeSourcery / Mentor Graphics
http://www.mentor.com/embedded-software/

From 6fe9a0e8f1db73f688bebc37671d8397bd9094cc Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <[email protected]>
Date: Wed, 31 Jul 2013 16:35:31 -0400
Subject: [PATCH] Add tracing instrumentation for pthread mutex lock functions.

Signed-off-by: Stefan Seefeld <[email protected]>
Acked-by: Mathieu Desnoyers <[email protected]>
---
 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
liblttng-ust-libc-wrapper/Makefile.am +11 -1
index 4fdcedb..d402d53 100644
@@ -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
liblttng-ust-libc-wrapper/lttng-ust-pthread.c new file +106 -0
new file mode 100644
index 0000000..e72b9b4
@@ -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;
+}
liblttng-ust-libc-wrapper/ust_pthread.h new file +76 -0
new file mode 100644
index 0000000..7d35c3a
@@ -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
Signature · 1 line
1.8.3.1
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com