diff options
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | tools/perf/builtin-trace.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 914ab366e369..e9d256e2f47d 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -35,14 +35,14 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) | |||
35 | 35 | ||
36 | thread = threads__findnew(event->comm.pid, &threads, &last_match); | 36 | thread = threads__findnew(event->comm.pid, &threads, &last_match); |
37 | 37 | ||
38 | dump_printf("%p [%p]: PERF_EVENT_COMM: %s:%d\n", | 38 | dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", |
39 | (void *)(offset + head), | 39 | (void *)(offset + head), |
40 | (void *)(long)(event->header.size), | 40 | (void *)(long)(event->header.size), |
41 | event->comm.comm, event->comm.pid); | 41 | event->comm.comm, event->comm.pid); |
42 | 42 | ||
43 | if (thread == NULL || | 43 | if (thread == NULL || |
44 | thread__set_comm(thread, event->comm.comm)) { | 44 | thread__set_comm(thread, event->comm.comm)) { |
45 | dump_printf("problem processing PERF_EVENT_COMM, skipping event.\n"); | 45 | dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n"); |
46 | return -1; | 46 | return -1; |
47 | } | 47 | } |
48 | total_comm++; | 48 | total_comm++; |
@@ -82,7 +82,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) | |||
82 | more_data += sizeof(u64); | 82 | more_data += sizeof(u64); |
83 | } | 83 | } |
84 | 84 | ||
85 | dump_printf("%p [%p]: PERF_EVENT_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n", | 85 | dump_printf("%p [%p]: PERF_RECORD_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n", |
86 | (void *)(offset + head), | 86 | (void *)(offset + head), |
87 | (void *)(long)(event->header.size), | 87 | (void *)(long)(event->header.size), |
88 | event->header.misc, | 88 | event->header.misc, |
@@ -98,9 +98,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) | |||
98 | return -1; | 98 | return -1; |
99 | } | 99 | } |
100 | 100 | ||
101 | cpumode = event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK; | 101 | cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; |
102 | 102 | ||
103 | if (cpumode == PERF_EVENT_MISC_KERNEL) { | 103 | if (cpumode == PERF_RECORD_MISC_KERNEL) { |
104 | show = SHOW_KERNEL; | 104 | show = SHOW_KERNEL; |
105 | level = 'k'; | 105 | level = 'k'; |
106 | 106 | ||
@@ -108,7 +108,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) | |||
108 | 108 | ||
109 | dump_printf(" ...... dso: %s\n", dso->name); | 109 | dump_printf(" ...... dso: %s\n", dso->name); |
110 | 110 | ||
111 | } else if (cpumode == PERF_EVENT_MISC_USER) { | 111 | } else if (cpumode == PERF_RECORD_MISC_USER) { |
112 | 112 | ||
113 | show = SHOW_USER; | 113 | show = SHOW_USER; |
114 | level = '.'; | 114 | level = '.'; |
@@ -146,19 +146,19 @@ process_event(event_t *event, unsigned long offset, unsigned long head) | |||
146 | trace_event(event); | 146 | trace_event(event); |
147 | 147 | ||
148 | switch (event->header.type) { | 148 | switch (event->header.type) { |
149 | case PERF_EVENT_MMAP ... PERF_EVENT_LOST: | 149 | case PERF_RECORD_MMAP ... PERF_RECORD_LOST: |
150 | return 0; | 150 | return 0; |
151 | 151 | ||
152 | case PERF_EVENT_COMM: | 152 | case PERF_RECORD_COMM: |
153 | return process_comm_event(event, offset, head); | 153 | return process_comm_event(event, offset, head); |
154 | 154 | ||
155 | case PERF_EVENT_EXIT ... PERF_EVENT_READ: | 155 | case PERF_RECORD_EXIT ... PERF_RECORD_READ: |
156 | return 0; | 156 | return 0; |
157 | 157 | ||
158 | case PERF_EVENT_SAMPLE: | 158 | case PERF_RECORD_SAMPLE: |
159 | return process_sample_event(event, offset, head); | 159 | return process_sample_event(event, offset, head); |
160 | 160 | ||
161 | case PERF_EVENT_MAX: | 161 | case PERF_RECORD_MAX: |
162 | default: | 162 | default: |
163 | return -1; | 163 | return -1; |
164 | } | 164 | } |