X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=f3e1e19e28e52d8d5fe07d399f6c4741d0d87282;hb=16adecf1f2e80025667ed53f4905e725894f076a;hp=771d8382c50eabfe1c47160360601ee2333c6571;hpb=fe7e563b1b37b8f1962006eabb4e7dc7368341f1;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 771d8382..f3e1e19e 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -18,6 +18,11 @@
  */
 
 #define _GNU_SOURCE
+/*
+ * Do _not_ define _LGPL_SOURCE because we don't want to create a
+ * circular dependency loop between this malloc wrapper, liburcu and
+ * libc.
+ */
 #include <lttng/ust-dlfcn.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -28,10 +33,11 @@
 #include <urcu/tls-compat.h>
 #include <urcu/arch.h>
 #include <lttng/align.h>
+#include <helper.h>
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM caller
+#define TP_IP_PARAM ip
 #include "ust_libc.h"
 
 #define STATIC_CALLOC_LEN 4096
@@ -262,7 +268,7 @@ void *malloc(size_t size)
 	retval = cur_alloc.malloc(size);
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, malloc,
-			size, retval, __builtin_return_address(0));
+			size, retval, LTTNG_UST_CALLER_IP());
 	}
 	URCU_TLS(malloc_nesting)--;
 	return retval;
@@ -282,7 +288,7 @@ void free(void *ptr)
 
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, free,
-			ptr, __builtin_return_address(0));
+			ptr, LTTNG_UST_CALLER_IP());
 	}
 
 	if (cur_alloc.free == NULL) {
@@ -312,7 +318,7 @@ void *calloc(size_t nmemb, size_t size)
 	retval = cur_alloc.calloc(nmemb, size);
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, calloc,
-			nmemb, size, retval, __builtin_return_address(0));
+			nmemb, size, retval, LTTNG_UST_CALLER_IP());
 	}
 	URCU_TLS(malloc_nesting)--;
 	return retval;
@@ -365,7 +371,7 @@ void *realloc(void *ptr, size_t size)
 end:
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, realloc,
-			ptr, size, retval, __builtin_return_address(0));
+			ptr, size, retval, LTTNG_UST_CALLER_IP());
 	}
 	URCU_TLS(malloc_nesting)--;
 	return retval;
@@ -387,7 +393,7 @@ void *memalign(size_t alignment, size_t size)
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, memalign,
 			alignment, size, retval,
-			__builtin_return_address(0));
+			LTTNG_UST_CALLER_IP());
 	}
 	URCU_TLS(malloc_nesting)--;
 	return retval;
@@ -409,12 +415,18 @@ int posix_memalign(void **memptr, size_t alignment, size_t size)
 	if (URCU_TLS(malloc_nesting) == 1) {
 		tracepoint(lttng_ust_libc, posix_memalign,
 			*memptr, alignment, size,
-			retval, __builtin_return_address(0));
+			retval, LTTNG_UST_CALLER_IP());
 	}
 	URCU_TLS(malloc_nesting)--;
 	return retval;
 }
 
+static
+void lttng_ust_fixup_malloc_nesting_tls(void)
+{
+	asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
+}
+
 __attribute__((constructor))
 void lttng_ust_malloc_wrapper_init(void)
 {
@@ -422,6 +434,7 @@ void lttng_ust_malloc_wrapper_init(void)
 	if (cur_alloc.calloc) {
 		return;
 	}
+	lttng_ust_fixup_malloc_nesting_tls();
 	/*
 	 * Ensure the allocator is in place before the process becomes
 	 * multithreaded.