From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 10 Jun 2015 11:17:33 +0000 (+0200)
Subject: Remove caller field from malloc events
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=52c95399b67cf5a0bf4d52ffb4b354d67b8625ae;p=deliverable%2Flttng-ust.git

Remove caller field from malloc events

This duplicates info now available in the "ip" context.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 771d8382..ba8e4d42 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -31,7 +31,7 @@
 
 #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
diff --git a/liblttng-ust-libc-wrapper/ust_libc.h b/liblttng-ust-libc-wrapper/ust_libc.h
index ab190e84..6bcfd390 100644
--- a/liblttng-ust-libc-wrapper/ust_libc.h
+++ b/liblttng-ust-libc-wrapper/ust_libc.h
@@ -33,60 +33,54 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_libc, malloc,
-	TP_ARGS(size_t, size, void *, ptr, void *, caller),
+	TP_ARGS(size_t, size, void *, ptr, void *, ip),
 	TP_FIELDS(
 		ctf_integer(size_t, size, size)
 		ctf_integer_hex(void *, ptr, ptr)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, free,
-	TP_ARGS(void *, ptr, void *, caller),
+	TP_ARGS(void *, ptr, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, ptr, ptr)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, calloc,
-	TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, caller),
+	TP_ARGS(size_t, nmemb, size_t, size, void *, ptr, void *, ip),
 	TP_FIELDS(
 		ctf_integer(size_t, nmemb, nmemb)
 		ctf_integer(size_t, size, size)
 		ctf_integer_hex(void *, ptr, ptr)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, realloc,
-	TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, caller),
+	TP_ARGS(void *, in_ptr, size_t, size, void *, ptr, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, in_ptr, in_ptr)
 		ctf_integer(size_t, size, size)
 		ctf_integer_hex(void *, ptr, ptr)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, memalign,
-	TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, caller),
+	TP_ARGS(size_t, alignment, size_t, size, void *, ptr, void *, ip),
 	TP_FIELDS(
 		ctf_integer(size_t, alignment, alignment)
 		ctf_integer(size_t, size, size)
 		ctf_integer_hex(void *, ptr, ptr)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )
 
 TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
-	TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, caller),
+	TP_ARGS(void *, out_ptr, size_t, alignment, size_t, size, int, result, void *, ip),
 	TP_FIELDS(
 		ctf_integer_hex(void *, out_ptr, out_ptr)
 		ctf_integer(size_t, alignment, alignment)
 		ctf_integer(size_t, size, size)
 		ctf_integer(int, result, result)
-		ctf_integer_hex(void *, caller, caller)
 	)
 )