[tip:perfcounters/urgent] perf_counter: Complete counter swap

tip-bot for Peter Zijlstra
2009-06-26T15:53:29Z

Commit-ID: 19d2e755436054dfc2be640bffc32e427c37ac3d
Gitweb: http://git.kernel.org/tip/19d2e755436054dfc2be640bffc32e427c37ac3d
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
AuthorDate: Fri, 26 Jun 2009 13:10:23 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 26 Jun 2009 17:48:54 +0200

perf_counter: Complete counter swap

Complete the counter swap by indeed switching the times too and
updating the userpage after modifying the counter values.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1246014623.31755.195.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

---
kernel/perf_counter.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index f2f2326..66ab1e9 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1048,9 +1048,14 @@ static void __perf_counter_sync_stat(struct perf_counter *counter,
value = atomic64_xchg(&counter->count, value);
atomic64_set(&next_counter->count, value);

+ swap(counter->total_time_enabled, next_counter->total_time_enabled);
+ swap(counter->total_time_running, next_counter->total_time_running);
+
/*
- * XXX also sync time_enabled and time_running ?
+ * Since we swizzled the values, update the user visible data too.
*/
+ perf_counter_update_userpage(counter);
+ perf_counter_update_userpage(next_counter);
}

#define list_next_entry(pos, member) \