diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-04-02 05:12:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:30:46 -0400 |
| commit | 3df70fd623bb109e0079e697c0276d220a4b7908 (patch) | |
| tree | ca6769f8e2aabfe87ff0cee45b9e49884cdb623e /Documentation/perf_counter | |
| parent | c457810ab4a825161aec6ef71b581e1bc8febd1a (diff) | |
perf_counter: kerneltop: update to new ABI
Update to reflect the new record_type ABI changes.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Orig-LKML-Reference: <20090402091319.407283141@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/perf_counter')
| -rw-r--r-- | Documentation/perf_counter/kerneltop.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/perf_counter/kerneltop.c b/Documentation/perf_counter/kerneltop.c index 33b4fcf6e489..4f8d7917aba1 100644 --- a/Documentation/perf_counter/kerneltop.c +++ b/Documentation/perf_counter/kerneltop.c | |||
| @@ -442,7 +442,7 @@ static void create_perfstat_counter(int counter) | |||
| 442 | 442 | ||
| 443 | memset(&hw_event, 0, sizeof(hw_event)); | 443 | memset(&hw_event, 0, sizeof(hw_event)); |
| 444 | hw_event.config = event_id[counter]; | 444 | hw_event.config = event_id[counter]; |
| 445 | hw_event.record_type = PERF_RECORD_SIMPLE; | 445 | hw_event.record_type = 0; |
| 446 | hw_event.nmi = 0; | 446 | hw_event.nmi = 0; |
| 447 | if (scale) | 447 | if (scale) |
| 448 | hw_event.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | | 448 | hw_event.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | |
| @@ -1277,8 +1277,8 @@ static void mmap_read(struct mmap_data *md) | |||
| 1277 | old += size; | 1277 | old += size; |
| 1278 | 1278 | ||
| 1279 | switch (event->header.type) { | 1279 | switch (event->header.type) { |
| 1280 | case PERF_EVENT_OVERFLOW | __PERF_EVENT_IP: | 1280 | case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP: |
| 1281 | case PERF_EVENT_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID: | 1281 | case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID: |
| 1282 | process_event(event->ip.ip, md->counter); | 1282 | process_event(event->ip.ip, md->counter); |
| 1283 | break; | 1283 | break; |
| 1284 | 1284 | ||
| @@ -1337,9 +1337,8 @@ int main(int argc, char *argv[]) | |||
| 1337 | memset(&hw_event, 0, sizeof(hw_event)); | 1337 | memset(&hw_event, 0, sizeof(hw_event)); |
| 1338 | hw_event.config = event_id[counter]; | 1338 | hw_event.config = event_id[counter]; |
| 1339 | hw_event.irq_period = event_count[counter]; | 1339 | hw_event.irq_period = event_count[counter]; |
| 1340 | hw_event.record_type = PERF_RECORD_IRQ; | 1340 | hw_event.record_type = PERF_RECORD_IP | PERF_RECORD_TID; |
| 1341 | hw_event.nmi = nmi; | 1341 | hw_event.nmi = nmi; |
| 1342 | hw_event.include_tid = 1; | ||
| 1343 | hw_event.mmap = use_mmap; | 1342 | hw_event.mmap = use_mmap; |
| 1344 | hw_event.munmap = use_munmap; | 1343 | hw_event.munmap = use_munmap; |
| 1345 | 1344 | ||