aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2009-07-22 09:05:46 -0400
committerPeter Zijlstra <a.p.zijlstra@chello.nl>2009-07-22 12:05:56 -0400
commit966ee4d6b887c14159043ac80b8c3661d2bbe5e2 (patch)
tree2f06225dc023f5fc07f1135147dd09f19601ba2b /kernel
parenta0541234f89c93f313961ce7b28676e11488a5f0 (diff)
perf_counter: Fix throttle/unthrottle event logging
Right now we only print PERF_EVENT_THROTTLE + 1 (ie PERF_EVENT_UNTHROTTLE). Fix this to print both a throttle and unthrottle event. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20090722130546.GE9029@kryten>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 7530588fa5c5..787d4daef185 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3217,7 +3217,7 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
3217 u64 stream_id; 3217 u64 stream_id;
3218 } throttle_event = { 3218 } throttle_event = {
3219 .header = { 3219 .header = {
3220 .type = PERF_EVENT_THROTTLE + 1, 3220 .type = PERF_EVENT_THROTTLE,
3221 .misc = 0, 3221 .misc = 0,
3222 .size = sizeof(throttle_event), 3222 .size = sizeof(throttle_event),
3223 }, 3223 },
@@ -3226,6 +3226,9 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
3226 .stream_id = counter->id, 3226 .stream_id = counter->id,
3227 }; 3227 };
3228 3228
3229 if (enable)
3230 throttle_event.header.type = PERF_EVENT_UNTHROTTLE;
3231
3229 ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0); 3232 ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);
3230 if (ret) 3233 if (ret)
3231 return; 3234 return;