[lttng-dev] [lttng-ust PATCH] Fix: forwarding of call_site argument to field

[Mathieu Desnoyers]

merged, thanks!

Mathieu

* Woegerer, Paul (Paul_Woegerer at mentor.com) wrote:
> I ran some tests with the new function entry/exit instrumentations.
> 
> The tracepoint provider for lttng_ust_cyg_profile:func_entry and
> func_exit does not properly forward the call_site argument to the
> call_site field. The patch below fixes the problem.
> 
> 
> From c2891f8d78922170175d05a03253dcd418182868 Mon Sep 17 00:00:00 2001
> From: Paul Woegerer <paul_woegerer at mentor.com>
> Date: Wed, 27 Mar 2013 14:34:35 +0100
> Subject: [PATCH] Fix forwarding of call_site argument to field
> 
> ---
>  liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
> index 7629fb9..2e6dda8 100644
> --- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
> +++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
> @@ -36,7 +36,7 @@ TRACEPOINT_EVENT(lttng_ust_cyg_profile, func_entry,
>  	TP_ARGS(void *, func_addr, void *, call_site),
>  	TP_FIELDS(
>  		ctf_integer_hex(void *, addr, func_addr)
> -		ctf_integer_hex(void *, call_site, func_addr)
> +		ctf_integer_hex(void *, call_site, call_site)
>  	)
>  )
>  
> @@ -47,7 +47,7 @@ TRACEPOINT_EVENT(lttng_ust_cyg_profile, func_exit,
>  	TP_ARGS(void *, func_addr, void *, call_site),
>  	TP_FIELDS(
>  		ctf_integer_hex(void *, addr, func_addr)
> -		ctf_integer_hex(void *, call_site, func_addr)
> +		ctf_integer_hex(void *, call_site, call_site)
>  	)
>  )
>  
> -- 
> 1.7.10.4
> 
> -- 
> Paul Woegerer | SW Development Engineer
> http://go.mentor.com/sourceryanalyzer
> 
> Mentor Embedded(tm) | Prinz Eugen Straße 72/2/4, Vienna, 1040 Austria
> Nucleus® | Linux® | Android(tm) | Services | UI | Multi-OS
> 
> Android is a trademark of Google Inc. Use of this trademark is subject to Google Permissions.
> Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com