Re: [PATCH 2/2 v3] tracing/lock: provide lock_acquired event supportfor dynamic size string

[Steven Rostedt]

On Sun, 19 Apr 2009, Frederic Weisbecker wrote:

> Now that we can support the dynamic sized string, make the lock tracing
> able to use it, making it safe against modules removal and consuming
> the right amount of memory needed for each lock name
> 
> Changes in v2:
> adapt to the __ending_string() updates and the opening_string() removal.
> 
> [ Impact: protect against module removal ]
> 
> Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> ---
>  include/trace/events/lockdep.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/trace/events/lockdep.h b/include/trace/events/lockdep.h
> index 45e326b..3ca315c 100644
> --- a/include/trace/events/lockdep.h
> +++ b/include/trace/events/lockdep.h
> @@ -38,16 +38,16 @@ TRACE_EVENT(lock_acquired,
>  	TP_ARGS(lock, ip, waittime),
>  
>  	TP_STRUCT__entry(
> -		__field(const char *, name)
> +		__string(name, lock->name)
>  		__field(unsigned long, wait_usec)
>  		__field(unsigned long, wait_nsec_rem)
>  	),
>  	TP_fast_assign(
> -		__entry->name = lock->name;
> +		__assign_str(name, lock->name);
>  		__entry->wait_nsec_rem = do_div(waittime, NSEC_PER_USEC);
>  		__entry->wait_usec = (unsigned long) waittime;
>  	),
> -	TP_printk("%s (%lu.%03lu us)", __entry->name, __entry->wait_usec,
> +	TP_printk("%s (%lu.%03lu us)", __get_str(name), __entry->wait_usec,
>  				       __entry->wait_nsec_rem)
>  );

Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

-- Steve

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/