* [PATCH] LOCKSTAT: patch test - Fix min, max times in /proc/lock_stats
@ 2009-11-19 21:42 Frank Rowand
2009-11-19 22:29 ` Peter Zijlstra
2009-12-06 13:03 ` [tip:core/urgent] lockstat: " tip-bot for Frank Rowand
0 siblings, 2 replies; 3+ messages in thread
From: Frank Rowand @ 2009-11-19 21:42 UTC (permalink / raw)
To: peterz, mingo; +Cc: tom.leiming, linux-kernel
Fix min, max times in /proc/lock_stats
(1) When collecting lock hold and wait times, if the current minimum time is
zero, it will be replaced by the next time.
(2) When aggregating minimum and maximum lock hold and wait times accross cpus,
the values are added, instead of selecting the minimum and maximum.
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
---
kernel/lockdep.c | 11 9 + 2 - 0 !
1 files changed, 9 insertions(+), 2 deletions(-)
Index: linux-2.6/kernel/lockdep.c
===================================================================
--- linux-2.6.orig/kernel/lockdep.c
+++ linux-2.6/kernel/lockdep.c
@@ -168,7 +168,7 @@ static void lock_time_inc(struct lock_ti
if (time > lt->max)
lt->max = time;
- if (time < lt->min || !lt->min)
+ if (time < lt->min || !lt->nr)
lt->min = time;
lt->total += time;
@@ -177,8 +177,15 @@ static void lock_time_inc(struct lock_ti
static inline void lock_time_add(struct lock_time *src, struct lock_time *dst)
{
- dst->min += src->min;
- dst->max += src->max;
+ if (!src->nr)
+ return;
+
+ if (src->max > dst->max)
+ dst->max = src->max;
+
+ if (src->min < dst->min || !dst->nr)
+ dst->min = src->min;
+
dst->total += src->total;
dst->nr += src->nr;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] LOCKSTAT: patch test - Fix min, max times in /proc/lock_stats
2009-11-19 21:42 [PATCH] LOCKSTAT: patch test - Fix min, max times in /proc/lock_stats Frank Rowand
@ 2009-11-19 22:29 ` Peter Zijlstra
2009-12-06 13:03 ` [tip:core/urgent] lockstat: " tip-bot for Frank Rowand
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2009-11-19 22:29 UTC (permalink / raw)
To: frank.rowand; +Cc: mingo, tom.leiming, linux-kernel
On Thu, 2009-11-19 at 13:42 -0800, Frank Rowand wrote:
> Fix min, max times in /proc/lock_stats
>
> (1) When collecting lock hold and wait times, if the current minimum time is
> zero, it will be replaced by the next time.
>
> (2) When aggregating minimum and maximum lock hold and wait times accross cpus,
> the values are added, instead of selecting the minimum and maximum.
>
>
> Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
Thanks Frank, took both patches.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:core/urgent] lockstat: Fix min, max times in /proc/lock_stats
2009-11-19 21:42 [PATCH] LOCKSTAT: patch test - Fix min, max times in /proc/lock_stats Frank Rowand
2009-11-19 22:29 ` Peter Zijlstra
@ 2009-12-06 13:03 ` tip-bot for Frank Rowand
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Frank Rowand @ 2009-12-06 13:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, a.p.zijlstra, frank.rowand, tglx, mingo
Commit-ID: 109d71c6dd52ec08878c2c67eb4c0bd67fcbc80b
Gitweb: http://git.kernel.org/tip/109d71c6dd52ec08878c2c67eb4c0bd67fcbc80b
Author: Frank Rowand <frank.rowand@am.sony.com>
AuthorDate: Thu, 19 Nov 2009 13:42:06 -0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 6 Dec 2009 13:20:00 +0100
lockstat: Fix min, max times in /proc/lock_stats
Fix min, max times in /proc/lock_stats
(1) When collecting lock hold and wait times, if the current minimum
time is zero, it will be replaced by the next time.
(2) When aggregating minimum and maximum lock hold and wait times
accross cpus, the values are added, instead of selecting the
minimum and maximum.
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4B05BBAE.2050005@am.sony.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/lockdep.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index f5dcd36..7a3ae56 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -168,7 +168,7 @@ static void lock_time_inc(struct lock_time *lt, u64 time)
if (time > lt->max)
lt->max = time;
- if (time < lt->min || !lt->min)
+ if (time < lt->min || !lt->nr)
lt->min = time;
lt->total += time;
@@ -177,8 +177,15 @@ static void lock_time_inc(struct lock_time *lt, u64 time)
static inline void lock_time_add(struct lock_time *src, struct lock_time *dst)
{
- dst->min += src->min;
- dst->max += src->max;
+ if (!src->nr)
+ return;
+
+ if (src->max > dst->max)
+ dst->max = src->max;
+
+ if (src->min < dst->min || !dst->nr)
+ dst->min = src->min;
+
dst->total += src->total;
dst->nr += src->nr;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-06 13:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-19 21:42 [PATCH] LOCKSTAT: patch test - Fix min, max times in /proc/lock_stats Frank Rowand
2009-11-19 22:29 ` Peter Zijlstra
2009-12-06 13:03 ` [tip:core/urgent] lockstat: " tip-bot for Frank Rowand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.