Fix: function instrumentation ip context

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

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
index ab42185c623230128f88531aae279b67ab7f8d5a..61ece1f8a71df1aab45146d661fea317be8f956a 100644 (file)
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
@@ -24,6 +24,7 @@
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
+#define TP_IP_PARAM func_addr
 #include "lttng-ust-cyg-profile-fast.h"
 
 void __cyg_profile_func_enter(void *this_fn, void *call_site)
@@ -39,5 +40,5 @@ void __cyg_profile_func_enter(void *this_fn, void *call_site)
 
 void __cyg_profile_func_exit(void *this_fn, void *call_site)
 {
-       tracepoint(lttng_ust_cyg_profile_fast, func_exit);
+       tracepoint(lttng_ust_cyg_profile_fast, func_exit, this_fn);
 }

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
index 0a6c67f969506fe43bae1ce80b66a7145603f7b1..ea6383861dd057debb211a23e726eaf51ca74b1f 100644 (file)
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
@@ -44,7 +44,7 @@ TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile_fast, func_entry,
        TRACE_DEBUG_FUNCTION)
 
 TRACEPOINT_EVENT(lttng_ust_cyg_profile_fast, func_exit,
-       TP_ARGS(void),
+       TP_ARGS(void *, func_addr),
        TP_FIELDS()
 )
 

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
index 2ff11595b5b9fc69e080c06a491772d00eaf7df8..c63b39b04ba033f808fdc0da4c287a86b4ffe5d5 100644 (file)
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
@@ -24,6 +24,7 @@
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
+#define TP_IP_PARAM func_addr
 #include "lttng-ust-cyg-profile.h"
 
 void __cyg_profile_func_enter(void *this_fn, void *call_site)