projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't call __builtin_return_address(0) on 32-bit powerpc
[lttng-ust.git]
/
liblttng-ust-libc-wrapper
/
lttng-ust-malloc.c
diff --git
a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index ba8e4d42ac018e5808e80431aabe213bd9f5df7c..d1ad3cf5b146260cf93548df5bf2a41ae9358057 100644
(file)
--- a/
liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/
liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@
-28,6
+28,7
@@
#include <urcu/tls-compat.h>
#include <urcu/arch.h>
#include <lttng/align.h>
#include <urcu/tls-compat.h>
#include <urcu/arch.h>
#include <lttng/align.h>
+#include <helper.h>
#define TRACEPOINT_DEFINE
#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE
#define TRACEPOINT_CREATE_PROBES
@@
-262,7
+263,7
@@
void *malloc(size_t size)
retval = cur_alloc.malloc(size);
if (URCU_TLS(malloc_nesting) == 1) {
tracepoint(lttng_ust_libc, malloc,
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;
}
URCU_TLS(malloc_nesting)--;
return retval;
@@
-282,7
+283,7
@@
void free(void *ptr)
if (URCU_TLS(malloc_nesting) == 1) {
tracepoint(lttng_ust_libc, free,
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) {
}
if (cur_alloc.free == NULL) {
@@
-312,7
+313,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,
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;
}
URCU_TLS(malloc_nesting)--;
return retval;
@@
-365,7
+366,7
@@
void *realloc(void *ptr, size_t size)
end:
if (URCU_TLS(malloc_nesting) == 1) {
tracepoint(lttng_ust_libc, realloc,
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;
}
URCU_TLS(malloc_nesting)--;
return retval;
@@
-387,7
+388,7
@@
void *memalign(size_t alignment, size_t size)
if (URCU_TLS(malloc_nesting) == 1) {
tracepoint(lttng_ust_libc, memalign,
alignment, size, retval,
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;
}
URCU_TLS(malloc_nesting)--;
return retval;
@@
-409,7
+410,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,
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;
}
URCU_TLS(malloc_nesting)--;
return retval;
This page took
0.025025 seconds
and
4
git commands to generate.