summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-04-19 04:54:49 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-22 12:30:15 +0200
commit7e7ca9a22dbbc5c91763cd16923c7509918709b6 (patch)
tree3d036f3cf4dc9c375b032e12afafc75bffcd17a8 /include
parent9cbf117662e24c6d33245666804487f92c21b59d (diff)
downloadlinux-7e7ca9a22dbbc5c91763cd16923c7509918709b6.tar.bz2
tracing/lock: provide lock_acquired event support for dynamic size string
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 lock tracer against module removal ] Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include')
-rw-r--r--include/trace/events/lockdep.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/lockdep.h b/include/trace/events/lockdep.h
index 45e326b5c7f3..3ca315c1429d 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)
);