Commit-ID: e87379ce0da06a63dc5bf7f1a9ed5c38b56e9726
Gitweb: http://git.kernel.org/tip/e87379ce0da06a63dc5bf7f1a9ed5c38b56e9726
Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 16 Dec 2009 12:28:25 +0900
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 16 Dec 2009 08:48:58 +0100
perf lock: Fix output of tracing lock events
This patch adds address of lockdep_map to each lock events.
perf lock uses these addresses as IDs of lock instances.
And this removes waittime from output of lock_acquired event.
The value will be caliculated in userspace based on timestamp.
Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <1260934105-4472-2-git-send-email-mitake@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/trace/events/lock.h | 27 ++++++++++++++++++---------
kernel/lockdep.c | 2 +-
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/include/trace/events/lock.h b/include/trace/events/lock.h
index a870ba1..2f94e25 100644
--- a/include/trace/events/lock.h
+++ b/include/trace/events/lock.h
@@ -18,16 +18,19 @@ TRACE_EVENT(lock_acquire,
TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),
TP_STRUCT__entry(
+ __field(struct lockdep_map *, lockdep_addr)
__field(unsigned int, flags)
__string(name, lock->name)
),
TP_fast_assign(
+ __entry->lockdep_addr = lock;
__entry->flags = (trylock ? 1 : 0) | (read ? 2 : 0);
__assign_str(name, lock->name);
),
- TP_printk("%s%s%s", (__entry->flags & 1) ? "try " : "",
+ TP_printk("%p %s%s%s", __entry->lockdep_addr,
+ (__entry->flags & 1) ? "try " : "",
(__entry->flags & 2) ? "read " : "",
__get_str(name))
);
@@ -39,14 +42,16 @@ TRACE_EVENT(lock_release,
TP_ARGS(lock, nested, ip),
TP_STRUCT__entry(
+ __field(struct lockdep_map *, lockdep_addr)
__string(name, lock->name)
),
TP_fast_assign(
+ __entry->lockdep_addr = lock;
__assign_str(name, lock->name);
),
- TP_printk("%s", __get_str(name))
+ TP_printk("%p %s", __entry->lockdep_addr, __get_str(name))
);
#ifdef CONFIG_LOCK_STAT
@@ -58,33 +63,37 @@ TRACE_EVENT(lock_contended,
TP_ARGS(lock, ip),
TP_STRUCT__entry(
+ __field(struct lockdep_map *, lockdep_addr)
__string(name, lock->name)
),
TP_fast_assign(
+ __entry->lockdep_addr = lock;
__assign_str(name, lock->name);
),
- TP_printk("%s", __get_str(name))
+ TP_printk("%p %s", __entry->lockdep_addr, __get_str(name))
);
TRACE_EVENT(lock_acquired,
- TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime),
+ TP_PROTO(struct lockdep_map *lock, unsigned long ip),
- TP_ARGS(lock, ip, waittime),
+ TP_ARGS(lock, ip),
TP_STRUCT__entry(
+ __field(struct lockdep_map *, lockdep_addr)
__string(name, lock->name)
__field(unsigned long, wait_usec)
__field(unsigned long, wait_nsec_rem)
),
+
TP_fast_assign(
+ __entry->lockdep_addr = lock;
__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)", __get_str(name), __entry->wait_usec,
- __entry->wait_nsec_rem)
+
+ TP_printk("%p %s", __entry->lockdep_addr,
+ __get_str(name))
);
#endif
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index f5dcd36..d6c30a9 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -3383,7 +3383,7 @@ found_it:
hlock->holdtime_stamp = now;
}
- trace_lock_acquired(lock, ip, waittime);
+ trace_lock_acquired(lock, ip);
stats = get_lock_stats(hlock_class(hlock));
if (waittime) {
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|