X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=5d290445026575f15de5074cb33f696be62c09c1;hb=152ba2822ce0dc11947169d2fffe6e0a26a02573;hp=ba8e4d42ac018e5808e80431aabe213bd9f5df7c;hpb=52c95399b67cf5a0bf4d52ffb4b354d67b8625ae;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 ba8e4d42..5d290445 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,6 +33,7 @@
 #include <urcu/tls-compat.h>
 #include <urcu/arch.h>
 #include <lttng/align.h>
+#include <helper.h>
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
@@ -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,7 +415,7 @@ 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;