aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/session.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r--tools/perf/util/session.c905
1 files changed, 619 insertions, 286 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index fa9d652c2dc3..f5a8fbdd3f76 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -7,6 +7,8 @@
7#include <sys/types.h> 7#include <sys/types.h>
8#include <sys/mman.h> 8#include <sys/mman.h>
9 9
10#include "evlist.h"
11#include "evsel.h"
10#include "session.h" 12#include "session.h"
11#include "sort.h" 13#include "sort.h"
12#include "util.h" 14#include "util.h"
@@ -19,7 +21,7 @@ static int perf_session__open(struct perf_session *self, bool force)
19 self->fd_pipe = true; 21 self->fd_pipe = true;
20 self->fd = STDIN_FILENO; 22 self->fd = STDIN_FILENO;
21 23
22 if (perf_header__read(self, self->fd) < 0) 24 if (perf_session__read_header(self, self->fd) < 0)
23 pr_err("incompatible file format"); 25 pr_err("incompatible file format");
24 26
25 return 0; 27 return 0;
@@ -51,11 +53,21 @@ static int perf_session__open(struct perf_session *self, bool force)
51 goto out_close; 53 goto out_close;
52 } 54 }
53 55
54 if (perf_header__read(self, self->fd) < 0) { 56 if (perf_session__read_header(self, self->fd) < 0) {
55 pr_err("incompatible file format"); 57 pr_err("incompatible file format");
56 goto out_close; 58 goto out_close;
57 } 59 }
58 60
61 if (!perf_evlist__valid_sample_type(self->evlist)) {
62 pr_err("non matching sample_type");
63 goto out_close;
64 }
65
66 if (!perf_evlist__valid_sample_id_all(self->evlist)) {
67 pr_err("non matching sample_id_all");
68 goto out_close;
69 }
70
59 self->size = input_stat.st_size; 71 self->size = input_stat.st_size;
60 return 0; 72 return 0;
61 73
@@ -65,9 +77,39 @@ out_close:
65 return -1; 77 return -1;
66} 78}
67 79
80static void perf_session__id_header_size(struct perf_session *session)
81{
82 struct perf_sample *data;
83 u64 sample_type = session->sample_type;
84 u16 size = 0;
85
86 if (!session->sample_id_all)
87 goto out;
88
89 if (sample_type & PERF_SAMPLE_TID)
90 size += sizeof(data->tid) * 2;
91
92 if (sample_type & PERF_SAMPLE_TIME)
93 size += sizeof(data->time);
94
95 if (sample_type & PERF_SAMPLE_ID)
96 size += sizeof(data->id);
97
98 if (sample_type & PERF_SAMPLE_STREAM_ID)
99 size += sizeof(data->stream_id);
100
101 if (sample_type & PERF_SAMPLE_CPU)
102 size += sizeof(data->cpu) * 2;
103out:
104 session->id_hdr_size = size;
105}
106
68void perf_session__update_sample_type(struct perf_session *self) 107void perf_session__update_sample_type(struct perf_session *self)
69{ 108{
70 self->sample_type = perf_header__sample_type(&self->header); 109 self->sample_type = perf_evlist__sample_type(self->evlist);
110 self->sample_size = __perf_evsel__sample_size(self->sample_type);
111 self->sample_id_all = perf_evlist__sample_id_all(self->evlist);
112 perf_session__id_header_size(self);
71} 113}
72 114
73int perf_session__create_kernel_maps(struct perf_session *self) 115int perf_session__create_kernel_maps(struct perf_session *self)
@@ -85,7 +127,9 @@ static void perf_session__destroy_kernel_maps(struct perf_session *self)
85 machines__destroy_guest_kernel_maps(&self->machines); 127 machines__destroy_guest_kernel_maps(&self->machines);
86} 128}
87 129
88struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe) 130struct perf_session *perf_session__new(const char *filename, int mode,
131 bool force, bool repipe,
132 struct perf_event_ops *ops)
89{ 133{
90 size_t len = filename ? strlen(filename) + 1 : 0; 134 size_t len = filename ? strlen(filename) + 1 : 0;
91 struct perf_session *self = zalloc(sizeof(*self) + len); 135 struct perf_session *self = zalloc(sizeof(*self) + len);
@@ -93,38 +137,47 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc
93 if (self == NULL) 137 if (self == NULL)
94 goto out; 138 goto out;
95 139
96 if (perf_header__init(&self->header) < 0)
97 goto out_free;
98
99 memcpy(self->filename, filename, len); 140 memcpy(self->filename, filename, len);
100 self->threads = RB_ROOT; 141 self->threads = RB_ROOT;
101 INIT_LIST_HEAD(&self->dead_threads); 142 INIT_LIST_HEAD(&self->dead_threads);
102 self->hists_tree = RB_ROOT;
103 self->last_match = NULL; 143 self->last_match = NULL;
104 self->mmap_window = 32; 144 /*
145 * On 64bit we can mmap the data file in one go. No need for tiny mmap
146 * slices. On 32bit we use 32MB.
147 */
148#if BITS_PER_LONG == 64
149 self->mmap_window = ULLONG_MAX;
150#else
151 self->mmap_window = 32 * 1024 * 1024ULL;
152#endif
105 self->machines = RB_ROOT; 153 self->machines = RB_ROOT;
106 self->repipe = repipe; 154 self->repipe = repipe;
107 INIT_LIST_HEAD(&self->ordered_samples.samples_head); 155 INIT_LIST_HEAD(&self->ordered_samples.samples);
156 INIT_LIST_HEAD(&self->ordered_samples.sample_cache);
157 INIT_LIST_HEAD(&self->ordered_samples.to_free);
108 machine__init(&self->host_machine, "", HOST_KERNEL_ID); 158 machine__init(&self->host_machine, "", HOST_KERNEL_ID);
109 159
110 if (mode == O_RDONLY) { 160 if (mode == O_RDONLY) {
111 if (perf_session__open(self, force) < 0) 161 if (perf_session__open(self, force) < 0)
112 goto out_delete; 162 goto out_delete;
163 perf_session__update_sample_type(self);
113 } else if (mode == O_WRONLY) { 164 } else if (mode == O_WRONLY) {
114 /* 165 /*
115 * In O_RDONLY mode this will be performed when reading the 166 * In O_RDONLY mode this will be performed when reading the
116 * kernel MMAP event, in event__process_mmap(). 167 * kernel MMAP event, in perf_event__process_mmap().
117 */ 168 */
118 if (perf_session__create_kernel_maps(self) < 0) 169 if (perf_session__create_kernel_maps(self) < 0)
119 goto out_delete; 170 goto out_delete;
120 } 171 }
121 172
122 perf_session__update_sample_type(self); 173 if (ops && ops->ordering_requires_timestamps &&
174 ops->ordered_samples && !self->sample_id_all) {
175 dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n");
176 ops->ordered_samples = false;
177 }
178
123out: 179out:
124 return self; 180 return self;
125out_free:
126 free(self);
127 return NULL;
128out_delete: 181out_delete:
129 perf_session__delete(self); 182 perf_session__delete(self);
130 return NULL; 183 return NULL;
@@ -155,7 +208,6 @@ static void perf_session__delete_threads(struct perf_session *self)
155 208
156void perf_session__delete(struct perf_session *self) 209void perf_session__delete(struct perf_session *self)
157{ 210{
158 perf_header__exit(&self->header);
159 perf_session__destroy_kernel_maps(self); 211 perf_session__destroy_kernel_maps(self);
160 perf_session__delete_dead_threads(self); 212 perf_session__delete_dead_threads(self);
161 perf_session__delete_threads(self); 213 perf_session__delete_threads(self);
@@ -183,17 +235,16 @@ static bool symbol__match_parent_regex(struct symbol *sym)
183 return 0; 235 return 0;
184} 236}
185 237
186struct map_symbol *perf_session__resolve_callchain(struct perf_session *self, 238int perf_session__resolve_callchain(struct perf_session *self,
187 struct thread *thread, 239 struct thread *thread,
188 struct ip_callchain *chain, 240 struct ip_callchain *chain,
189 struct symbol **parent) 241 struct symbol **parent)
190{ 242{
191 u8 cpumode = PERF_RECORD_MISC_USER; 243 u8 cpumode = PERF_RECORD_MISC_USER;
192 unsigned int i; 244 unsigned int i;
193 struct map_symbol *syms = calloc(chain->nr, sizeof(*syms)); 245 int err;
194 246
195 if (!syms) 247 callchain_cursor_reset(&self->callchain_cursor);
196 return NULL;
197 248
198 for (i = 0; i < chain->nr; i++) { 249 for (i = 0; i < chain->nr; i++) {
199 u64 ip = chain->ips[i]; 250 u64 ip = chain->ips[i];
@@ -222,22 +273,42 @@ struct map_symbol *perf_session__resolve_callchain(struct perf_session *self,
222 *parent = al.sym; 273 *parent = al.sym;
223 if (!symbol_conf.use_callchain) 274 if (!symbol_conf.use_callchain)
224 break; 275 break;
225 syms[i].map = al.map;
226 syms[i].sym = al.sym;
227 } 276 }
277
278 err = callchain_cursor_append(&self->callchain_cursor,
279 ip, al.map, al.sym);
280 if (err)
281 return err;
228 } 282 }
229 283
230 return syms; 284 return 0;
285}
286
287static int process_event_synth_stub(union perf_event *event __used,
288 struct perf_session *session __used)
289{
290 dump_printf(": unhandled!\n");
291 return 0;
292}
293
294static int process_event_sample_stub(union perf_event *event __used,
295 struct perf_sample *sample __used,
296 struct perf_evsel *evsel __used,
297 struct perf_session *session __used)
298{
299 dump_printf(": unhandled!\n");
300 return 0;
231} 301}
232 302
233static int process_event_stub(event_t *event __used, 303static int process_event_stub(union perf_event *event __used,
304 struct perf_sample *sample __used,
234 struct perf_session *session __used) 305 struct perf_session *session __used)
235{ 306{
236 dump_printf(": unhandled!\n"); 307 dump_printf(": unhandled!\n");
237 return 0; 308 return 0;
238} 309}
239 310
240static int process_finished_round_stub(event_t *event __used, 311static int process_finished_round_stub(union perf_event *event __used,
241 struct perf_session *session __used, 312 struct perf_session *session __used,
242 struct perf_event_ops *ops __used) 313 struct perf_event_ops *ops __used)
243{ 314{
@@ -245,14 +316,14 @@ static int process_finished_round_stub(event_t *event __used,
245 return 0; 316 return 0;
246} 317}
247 318
248static int process_finished_round(event_t *event, 319static int process_finished_round(union perf_event *event,
249 struct perf_session *session, 320 struct perf_session *session,
250 struct perf_event_ops *ops); 321 struct perf_event_ops *ops);
251 322
252static void perf_event_ops__fill_defaults(struct perf_event_ops *handler) 323static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
253{ 324{
254 if (handler->sample == NULL) 325 if (handler->sample == NULL)
255 handler->sample = process_event_stub; 326 handler->sample = process_event_sample_stub;
256 if (handler->mmap == NULL) 327 if (handler->mmap == NULL)
257 handler->mmap = process_event_stub; 328 handler->mmap = process_event_stub;
258 if (handler->comm == NULL) 329 if (handler->comm == NULL)
@@ -262,7 +333,7 @@ static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
262 if (handler->exit == NULL) 333 if (handler->exit == NULL)
263 handler->exit = process_event_stub; 334 handler->exit = process_event_stub;
264 if (handler->lost == NULL) 335 if (handler->lost == NULL)
265 handler->lost = process_event_stub; 336 handler->lost = perf_event__process_lost;
266 if (handler->read == NULL) 337 if (handler->read == NULL)
267 handler->read = process_event_stub; 338 handler->read = process_event_stub;
268 if (handler->throttle == NULL) 339 if (handler->throttle == NULL)
@@ -270,13 +341,13 @@ static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
270 if (handler->unthrottle == NULL) 341 if (handler->unthrottle == NULL)
271 handler->unthrottle = process_event_stub; 342 handler->unthrottle = process_event_stub;
272 if (handler->attr == NULL) 343 if (handler->attr == NULL)
273 handler->attr = process_event_stub; 344 handler->attr = process_event_synth_stub;
274 if (handler->event_type == NULL) 345 if (handler->event_type == NULL)
275 handler->event_type = process_event_stub; 346 handler->event_type = process_event_synth_stub;
276 if (handler->tracing_data == NULL) 347 if (handler->tracing_data == NULL)
277 handler->tracing_data = process_event_stub; 348 handler->tracing_data = process_event_synth_stub;
278 if (handler->build_id == NULL) 349 if (handler->build_id == NULL)
279 handler->build_id = process_event_stub; 350 handler->build_id = process_event_synth_stub;
280 if (handler->finished_round == NULL) { 351 if (handler->finished_round == NULL) {
281 if (handler->ordered_samples) 352 if (handler->ordered_samples)
282 handler->finished_round = process_finished_round; 353 handler->finished_round = process_finished_round;
@@ -296,123 +367,155 @@ void mem_bswap_64(void *src, int byte_size)
296 } 367 }
297} 368}
298 369
299static void event__all64_swap(event_t *self) 370static void perf_event__all64_swap(union perf_event *event)
300{ 371{
301 struct perf_event_header *hdr = &self->header; 372 struct perf_event_header *hdr = &event->header;
302 mem_bswap_64(hdr + 1, self->header.size - sizeof(*hdr)); 373 mem_bswap_64(hdr + 1, event->header.size - sizeof(*hdr));
303} 374}
304 375
305static void event__comm_swap(event_t *self) 376static void perf_event__comm_swap(union perf_event *event)
306{ 377{
307 self->comm.pid = bswap_32(self->comm.pid); 378 event->comm.pid = bswap_32(event->comm.pid);
308 self->comm.tid = bswap_32(self->comm.tid); 379 event->comm.tid = bswap_32(event->comm.tid);
309} 380}
310 381
311static void event__mmap_swap(event_t *self) 382static void perf_event__mmap_swap(union perf_event *event)
312{ 383{
313 self->mmap.pid = bswap_32(self->mmap.pid); 384 event->mmap.pid = bswap_32(event->mmap.pid);
314 self->mmap.tid = bswap_32(self->mmap.tid); 385 event->mmap.tid = bswap_32(event->mmap.tid);
315 self->mmap.start = bswap_64(self->mmap.start); 386 event->mmap.start = bswap_64(event->mmap.start);
316 self->mmap.len = bswap_64(self->mmap.len); 387 event->mmap.len = bswap_64(event->mmap.len);
317 self->mmap.pgoff = bswap_64(self->mmap.pgoff); 388 event->mmap.pgoff = bswap_64(event->mmap.pgoff);
318} 389}
319 390
320static void event__task_swap(event_t *self) 391static void perf_event__task_swap(union perf_event *event)
321{ 392{
322 self->fork.pid = bswap_32(self->fork.pid); 393 event->fork.pid = bswap_32(event->fork.pid);
323 self->fork.tid = bswap_32(self->fork.tid); 394 event->fork.tid = bswap_32(event->fork.tid);
324 self->fork.ppid = bswap_32(self->fork.ppid); 395 event->fork.ppid = bswap_32(event->fork.ppid);
325 self->fork.ptid = bswap_32(self->fork.ptid); 396 event->fork.ptid = bswap_32(event->fork.ptid);
326 self->fork.time = bswap_64(self->fork.time); 397 event->fork.time = bswap_64(event->fork.time);
327} 398}
328 399
329static void event__read_swap(event_t *self) 400static void perf_event__read_swap(union perf_event *event)
330{ 401{
331 self->read.pid = bswap_32(self->read.pid); 402 event->read.pid = bswap_32(event->read.pid);
332 self->read.tid = bswap_32(self->read.tid); 403 event->read.tid = bswap_32(event->read.tid);
333 self->read.value = bswap_64(self->read.value); 404 event->read.value = bswap_64(event->read.value);
334 self->read.time_enabled = bswap_64(self->read.time_enabled); 405 event->read.time_enabled = bswap_64(event->read.time_enabled);
335 self->read.time_running = bswap_64(self->read.time_running); 406 event->read.time_running = bswap_64(event->read.time_running);
336 self->read.id = bswap_64(self->read.id); 407 event->read.id = bswap_64(event->read.id);
337} 408}
338 409
339static void event__attr_swap(event_t *self) 410static void perf_event__attr_swap(union perf_event *event)
340{ 411{
341 size_t size; 412 size_t size;
342 413
343 self->attr.attr.type = bswap_32(self->attr.attr.type); 414 event->attr.attr.type = bswap_32(event->attr.attr.type);
344 self->attr.attr.size = bswap_32(self->attr.attr.size); 415 event->attr.attr.size = bswap_32(event->attr.attr.size);
345 self->attr.attr.config = bswap_64(self->attr.attr.config); 416 event->attr.attr.config = bswap_64(event->attr.attr.config);
346 self->attr.attr.sample_period = bswap_64(self->attr.attr.sample_period); 417 event->attr.attr.sample_period = bswap_64(event->attr.attr.sample_period);
347 self->attr.attr.sample_type = bswap_64(self->attr.attr.sample_type); 418 event->attr.attr.sample_type = bswap_64(event->attr.attr.sample_type);
348 self->attr.attr.read_format = bswap_64(self->attr.attr.read_format); 419 event->attr.attr.read_format = bswap_64(event->attr.attr.read_format);
349 self->attr.attr.wakeup_events = bswap_32(self->attr.attr.wakeup_events); 420 event->attr.attr.wakeup_events = bswap_32(event->attr.attr.wakeup_events);
350 self->attr.attr.bp_type = bswap_32(self->attr.attr.bp_type); 421 event->attr.attr.bp_type = bswap_32(event->attr.attr.bp_type);
351 self->attr.attr.bp_addr = bswap_64(self->attr.attr.bp_addr); 422 event->attr.attr.bp_addr = bswap_64(event->attr.attr.bp_addr);
352 self->attr.attr.bp_len = bswap_64(self->attr.attr.bp_len); 423 event->attr.attr.bp_len = bswap_64(event->attr.attr.bp_len);
353 424
354 size = self->header.size; 425 size = event->header.size;
355 size -= (void *)&self->attr.id - (void *)self; 426 size -= (void *)&event->attr.id - (void *)event;
356 mem_bswap_64(self->attr.id, size); 427 mem_bswap_64(event->attr.id, size);
357} 428}
358 429
359static void event__event_type_swap(event_t *self) 430static void perf_event__event_type_swap(union perf_event *event)
360{ 431{
361 self->event_type.event_type.event_id = 432 event->event_type.event_type.event_id =
362 bswap_64(self->event_type.event_type.event_id); 433 bswap_64(event->event_type.event_type.event_id);
363} 434}
364 435
365static void event__tracing_data_swap(event_t *self) 436static void perf_event__tracing_data_swap(union perf_event *event)
366{ 437{
367 self->tracing_data.size = bswap_32(self->tracing_data.size); 438 event->tracing_data.size = bswap_32(event->tracing_data.size);
368} 439}
369 440
370typedef void (*event__swap_op)(event_t *self); 441typedef void (*perf_event__swap_op)(union perf_event *event);
371 442
372static event__swap_op event__swap_ops[] = { 443static perf_event__swap_op perf_event__swap_ops[] = {
373 [PERF_RECORD_MMAP] = event__mmap_swap, 444 [PERF_RECORD_MMAP] = perf_event__mmap_swap,
374 [PERF_RECORD_COMM] = event__comm_swap, 445 [PERF_RECORD_COMM] = perf_event__comm_swap,
375 [PERF_RECORD_FORK] = event__task_swap, 446 [PERF_RECORD_FORK] = perf_event__task_swap,
376 [PERF_RECORD_EXIT] = event__task_swap, 447 [PERF_RECORD_EXIT] = perf_event__task_swap,
377 [PERF_RECORD_LOST] = event__all64_swap, 448 [PERF_RECORD_LOST] = perf_event__all64_swap,
378 [PERF_RECORD_READ] = event__read_swap, 449 [PERF_RECORD_READ] = perf_event__read_swap,
379 [PERF_RECORD_SAMPLE] = event__all64_swap, 450 [PERF_RECORD_SAMPLE] = perf_event__all64_swap,
380 [PERF_RECORD_HEADER_ATTR] = event__attr_swap, 451 [PERF_RECORD_HEADER_ATTR] = perf_event__attr_swap,
381 [PERF_RECORD_HEADER_EVENT_TYPE] = event__event_type_swap, 452 [PERF_RECORD_HEADER_EVENT_TYPE] = perf_event__event_type_swap,
382 [PERF_RECORD_HEADER_TRACING_DATA] = event__tracing_data_swap, 453 [PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap,
383 [PERF_RECORD_HEADER_BUILD_ID] = NULL, 454 [PERF_RECORD_HEADER_BUILD_ID] = NULL,
384 [PERF_RECORD_HEADER_MAX] = NULL, 455 [PERF_RECORD_HEADER_MAX] = NULL,
385}; 456};
386 457
387struct sample_queue { 458struct sample_queue {
388 u64 timestamp; 459 u64 timestamp;
389 struct sample_event *event; 460 u64 file_offset;
461 union perf_event *event;
390 struct list_head list; 462 struct list_head list;
391}; 463};
392 464
465static void perf_session_free_sample_buffers(struct perf_session *session)
466{
467 struct ordered_samples *os = &session->ordered_samples;
468
469 while (!list_empty(&os->to_free)) {
470 struct sample_queue *sq;
471
472 sq = list_entry(os->to_free.next, struct sample_queue, list);
473 list_del(&sq->list);
474 free(sq);
475 }
476}
477
478static int perf_session_deliver_event(struct perf_session *session,
479 union perf_event *event,
480 struct perf_sample *sample,
481 struct perf_event_ops *ops,
482 u64 file_offset);
483
393static void flush_sample_queue(struct perf_session *s, 484static void flush_sample_queue(struct perf_session *s,
394 struct perf_event_ops *ops) 485 struct perf_event_ops *ops)
395{ 486{
396 struct list_head *head = &s->ordered_samples.samples_head; 487 struct ordered_samples *os = &s->ordered_samples;
397 u64 limit = s->ordered_samples.next_flush; 488 struct list_head *head = &os->samples;
398 struct sample_queue *tmp, *iter; 489 struct sample_queue *tmp, *iter;
490 struct perf_sample sample;
491 u64 limit = os->next_flush;
492 u64 last_ts = os->last_sample ? os->last_sample->timestamp : 0ULL;
493 int ret;
399 494
400 if (!ops->ordered_samples || !limit) 495 if (!ops->ordered_samples || !limit)
401 return; 496 return;
402 497
403 list_for_each_entry_safe(iter, tmp, head, list) { 498 list_for_each_entry_safe(iter, tmp, head, list) {
404 if (iter->timestamp > limit) 499 if (iter->timestamp > limit)
405 return; 500 break;
406
407 if (iter == s->ordered_samples.last_inserted)
408 s->ordered_samples.last_inserted = NULL;
409 501
410 ops->sample((event_t *)iter->event, s); 502 ret = perf_session__parse_sample(s, iter->event, &sample);
503 if (ret)
504 pr_err("Can't parse sample, err = %d\n", ret);
505 else
506 perf_session_deliver_event(s, iter->event, &sample, ops,
507 iter->file_offset);
411 508
412 s->ordered_samples.last_flush = iter->timestamp; 509 os->last_flush = iter->timestamp;
413 list_del(&iter->list); 510 list_del(&iter->list);
414 free(iter->event); 511 list_add(&iter->list, &os->sample_cache);
415 free(iter); 512 }
513
514 if (list_empty(head)) {
515 os->last_sample = NULL;
516 } else if (last_ts <= limit) {
517 os->last_sample =
518 list_entry(head->prev, struct sample_queue, list);
416 } 519 }
417} 520}
418 521
@@ -455,7 +558,7 @@ static void flush_sample_queue(struct perf_session *s,
455 * Flush every events below timestamp 7 558 * Flush every events below timestamp 7
456 * etc... 559 * etc...
457 */ 560 */
458static int process_finished_round(event_t *event __used, 561static int process_finished_round(union perf_event *event __used,
459 struct perf_session *session, 562 struct perf_session *session,
460 struct perf_event_ops *ops) 563 struct perf_event_ops *ops)
461{ 564{
@@ -465,178 +568,277 @@ static int process_finished_round(event_t *event __used,
465 return 0; 568 return 0;
466} 569}
467 570
468static void __queue_sample_end(struct sample_queue *new, struct list_head *head)
469{
470 struct sample_queue *iter;
471
472 list_for_each_entry_reverse(iter, head, list) {
473 if (iter->timestamp < new->timestamp) {
474 list_add(&new->list, &iter->list);
475 return;
476 }
477 }
478
479 list_add(&new->list, head);
480}
481
482static void __queue_sample_before(struct sample_queue *new,
483 struct sample_queue *iter,
484 struct list_head *head)
485{
486 list_for_each_entry_continue_reverse(iter, head, list) {
487 if (iter->timestamp < new->timestamp) {
488 list_add(&new->list, &iter->list);
489 return;
490 }
491 }
492
493 list_add(&new->list, head);
494}
495
496static void __queue_sample_after(struct sample_queue *new,
497 struct sample_queue *iter,
498 struct list_head *head)
499{
500 list_for_each_entry_continue(iter, head, list) {
501 if (iter->timestamp > new->timestamp) {
502 list_add_tail(&new->list, &iter->list);
503 return;
504 }
505 }
506 list_add_tail(&new->list, head);
507}
508
509/* The queue is ordered by time */ 571/* The queue is ordered by time */
510static void __queue_sample_event(struct sample_queue *new, 572static void __queue_event(struct sample_queue *new, struct perf_session *s)
511 struct perf_session *s)
512{ 573{
513 struct sample_queue *last_inserted = s->ordered_samples.last_inserted; 574 struct ordered_samples *os = &s->ordered_samples;
514 struct list_head *head = &s->ordered_samples.samples_head; 575 struct sample_queue *sample = os->last_sample;
576 u64 timestamp = new->timestamp;
577 struct list_head *p;
515 578
579 os->last_sample = new;
516 580
517 if (!last_inserted) { 581 if (!sample) {
518 __queue_sample_end(new, head); 582 list_add(&new->list, &os->samples);
583 os->max_timestamp = timestamp;
519 return; 584 return;
520 } 585 }
521 586
522 /* 587 /*
523 * Most of the time the current event has a timestamp 588 * last_sample might point to some random place in the list as it's
524 * very close to the last event inserted, unless we just switched 589 * the last queued event. We expect that the new event is close to
525 * to another event buffer. Having a sorting based on a list and 590 * this.
526 * on the last inserted event that is close to the current one is
527 * probably more efficient than an rbtree based sorting.
528 */ 591 */
529 if (last_inserted->timestamp >= new->timestamp) 592 if (sample->timestamp <= timestamp) {
530 __queue_sample_before(new, last_inserted, head); 593 while (sample->timestamp <= timestamp) {
531 else 594 p = sample->list.next;
532 __queue_sample_after(new, last_inserted, head); 595 if (p == &os->samples) {
596 list_add_tail(&new->list, &os->samples);
597 os->max_timestamp = timestamp;
598 return;
599 }
600 sample = list_entry(p, struct sample_queue, list);
601 }
602 list_add_tail(&new->list, &sample->list);
603 } else {
604 while (sample->timestamp > timestamp) {
605 p = sample->list.prev;
606 if (p == &os->samples) {
607 list_add(&new->list, &os->samples);
608 return;
609 }
610 sample = list_entry(p, struct sample_queue, list);
611 }
612 list_add(&new->list, &sample->list);
613 }
533} 614}
534 615
535static int queue_sample_event(event_t *event, struct sample_data *data, 616#define MAX_SAMPLE_BUFFER (64 * 1024 / sizeof(struct sample_queue))
536 struct perf_session *s) 617
618static int perf_session_queue_event(struct perf_session *s, union perf_event *event,
619 struct perf_sample *sample, u64 file_offset)
537{ 620{
538 u64 timestamp = data->time; 621 struct ordered_samples *os = &s->ordered_samples;
622 struct list_head *sc = &os->sample_cache;
623 u64 timestamp = sample->time;
539 struct sample_queue *new; 624 struct sample_queue *new;
540 625
626 if (!timestamp || timestamp == ~0ULL)
627 return -ETIME;
541 628
542 if (timestamp < s->ordered_samples.last_flush) { 629 if (timestamp < s->ordered_samples.last_flush) {
543 printf("Warning: Timestamp below last timeslice flush\n"); 630 printf("Warning: Timestamp below last timeslice flush\n");
544 return -EINVAL; 631 return -EINVAL;
545 } 632 }
546 633
547 new = malloc(sizeof(*new)); 634 if (!list_empty(sc)) {
548 if (!new) 635 new = list_entry(sc->next, struct sample_queue, list);
549 return -ENOMEM; 636 list_del(&new->list);
637 } else if (os->sample_buffer) {
638 new = os->sample_buffer + os->sample_buffer_idx;
639 if (++os->sample_buffer_idx == MAX_SAMPLE_BUFFER)
640 os->sample_buffer = NULL;
641 } else {
642 os->sample_buffer = malloc(MAX_SAMPLE_BUFFER * sizeof(*new));
643 if (!os->sample_buffer)
644 return -ENOMEM;
645 list_add(&os->sample_buffer->list, &os->to_free);
646 os->sample_buffer_idx = 2;
647 new = os->sample_buffer + 1;
648 }
550 649
551 new->timestamp = timestamp; 650 new->timestamp = timestamp;
651 new->file_offset = file_offset;
652 new->event = event;
552 653
553 new->event = malloc(event->header.size); 654 __queue_event(new, s);
554 if (!new->event) {
555 free(new);
556 return -ENOMEM;
557 }
558 655
559 memcpy(new->event, event, event->header.size); 656 return 0;
657}
560 658
561 __queue_sample_event(new, s); 659static void callchain__printf(struct perf_sample *sample)
562 s->ordered_samples.last_inserted = new; 660{
661 unsigned int i;
563 662
564 if (new->timestamp > s->ordered_samples.max_timestamp) 663 printf("... chain: nr:%" PRIu64 "\n", sample->callchain->nr);
565 s->ordered_samples.max_timestamp = new->timestamp;
566 664
567 return 0; 665 for (i = 0; i < sample->callchain->nr; i++)
666 printf("..... %2d: %016" PRIx64 "\n",
667 i, sample->callchain->ips[i]);
568} 668}
569 669
570static int perf_session__process_sample(event_t *event, struct perf_session *s, 670static void perf_session__print_tstamp(struct perf_session *session,
571 struct perf_event_ops *ops) 671 union perf_event *event,
672 struct perf_sample *sample)
572{ 673{
573 struct sample_data data; 674 if (event->header.type != PERF_RECORD_SAMPLE &&
675 !session->sample_id_all) {
676 fputs("-1 -1 ", stdout);
677 return;
678 }
574 679
575 if (!ops->ordered_samples) 680 if ((session->sample_type & PERF_SAMPLE_CPU))
576 return ops->sample(event, s); 681 printf("%u ", sample->cpu);
577 682
578 bzero(&data, sizeof(struct sample_data)); 683 if (session->sample_type & PERF_SAMPLE_TIME)
579 event__parse_sample(event, s->sample_type, &data); 684 printf("%" PRIu64 " ", sample->time);
685}
580 686
581 queue_sample_event(event, &data, s); 687static void dump_event(struct perf_session *session, union perf_event *event,
688 u64 file_offset, struct perf_sample *sample)
689{
690 if (!dump_trace)
691 return;
582 692
583 return 0; 693 printf("\n%#" PRIx64 " [%#x]: event: %d\n",
694 file_offset, event->header.size, event->header.type);
695
696 trace_event(event);
697
698 if (sample)
699 perf_session__print_tstamp(session, event, sample);
700
701 printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset,
702 event->header.size, perf_event__name(event->header.type));
584} 703}
585 704
586static int perf_session__process_event(struct perf_session *self, 705static void dump_sample(struct perf_session *session, union perf_event *event,
587 event_t *event, 706 struct perf_sample *sample)
588 struct perf_event_ops *ops,
589 u64 offset, u64 head)
590{ 707{
591 trace_event(event); 708 if (!dump_trace)
709 return;
592 710
593 if (event->header.type < PERF_RECORD_HEADER_MAX) { 711 printf("(IP, %d): %d/%d: %#" PRIx64 " period: %" PRIu64 "\n",
594 dump_printf("%#Lx [%#x]: PERF_RECORD_%s", 712 event->header.misc, sample->pid, sample->tid, sample->ip,
595 offset + head, event->header.size, 713 sample->period);
596 event__name[event->header.type]);
597 hists__inc_nr_events(&self->hists, event->header.type);
598 }
599 714
600 if (self->header.needs_swap && event__swap_ops[event->header.type]) 715 if (session->sample_type & PERF_SAMPLE_CALLCHAIN)
601 event__swap_ops[event->header.type](event); 716 callchain__printf(sample);
717}
718
719static int perf_session_deliver_event(struct perf_session *session,
720 union perf_event *event,
721 struct perf_sample *sample,
722 struct perf_event_ops *ops,
723 u64 file_offset)
724{
725 struct perf_evsel *evsel;
726
727 dump_event(session, event, file_offset, sample);
602 728
603 switch (event->header.type) { 729 switch (event->header.type) {
604 case PERF_RECORD_SAMPLE: 730 case PERF_RECORD_SAMPLE:
605 return perf_session__process_sample(event, self, ops); 731 dump_sample(session, event, sample);
732 evsel = perf_evlist__id2evsel(session->evlist, sample->id);
733 if (evsel == NULL) {
734 ++session->hists.stats.nr_unknown_id;
735 return -1;
736 }
737 return ops->sample(event, sample, evsel, session);
606 case PERF_RECORD_MMAP: 738 case PERF_RECORD_MMAP:
607 return ops->mmap(event, self); 739 return ops->mmap(event, sample, session);
608 case PERF_RECORD_COMM: 740 case PERF_RECORD_COMM:
609 return ops->comm(event, self); 741 return ops->comm(event, sample, session);
610 case PERF_RECORD_FORK: 742 case PERF_RECORD_FORK:
611 return ops->fork(event, self); 743 return ops->fork(event, sample, session);
612 case PERF_RECORD_EXIT: 744 case PERF_RECORD_EXIT:
613 return ops->exit(event, self); 745 return ops->exit(event, sample, session);
614 case PERF_RECORD_LOST: 746 case PERF_RECORD_LOST:
615 return ops->lost(event, self); 747 return ops->lost(event, sample, session);
616 case PERF_RECORD_READ: 748 case PERF_RECORD_READ:
617 return ops->read(event, self); 749 return ops->read(event, sample, session);
618 case PERF_RECORD_THROTTLE: 750 case PERF_RECORD_THROTTLE:
619 return ops->throttle(event, self); 751 return ops->throttle(event, sample, session);
620 case PERF_RECORD_UNTHROTTLE: 752 case PERF_RECORD_UNTHROTTLE:
621 return ops->unthrottle(event, self); 753 return ops->unthrottle(event, sample, session);
754 default:
755 ++session->hists.stats.nr_unknown_events;
756 return -1;
757 }
758}
759
760static int perf_session__preprocess_sample(struct perf_session *session,
761 union perf_event *event, struct perf_sample *sample)
762{
763 if (event->header.type != PERF_RECORD_SAMPLE ||
764 !(session->sample_type & PERF_SAMPLE_CALLCHAIN))
765 return 0;
766
767 if (!ip_callchain__valid(sample->callchain, event)) {
768 pr_debug("call-chain problem with event, skipping it.\n");
769 ++session->hists.stats.nr_invalid_chains;
770 session->hists.stats.total_invalid_chains += sample->period;
771 return -EINVAL;
772 }
773 return 0;
774}
775
776static int perf_session__process_user_event(struct perf_session *session, union perf_event *event,
777 struct perf_event_ops *ops, u64 file_offset)
778{
779 dump_event(session, event, file_offset, NULL);
780
781 /* These events are processed right away */
782 switch (event->header.type) {
622 case PERF_RECORD_HEADER_ATTR: 783 case PERF_RECORD_HEADER_ATTR:
623 return ops->attr(event, self); 784 return ops->attr(event, session);
624 case PERF_RECORD_HEADER_EVENT_TYPE: 785 case PERF_RECORD_HEADER_EVENT_TYPE:
625 return ops->event_type(event, self); 786 return ops->event_type(event, session);
626 case PERF_RECORD_HEADER_TRACING_DATA: 787 case PERF_RECORD_HEADER_TRACING_DATA:
627 /* setup for reading amidst mmap */ 788 /* setup for reading amidst mmap */
628 lseek(self->fd, offset + head, SEEK_SET); 789 lseek(session->fd, file_offset, SEEK_SET);
629 return ops->tracing_data(event, self); 790 return ops->tracing_data(event, session);
630 case PERF_RECORD_HEADER_BUILD_ID: 791 case PERF_RECORD_HEADER_BUILD_ID:
631 return ops->build_id(event, self); 792 return ops->build_id(event, session);
632 case PERF_RECORD_FINISHED_ROUND: 793 case PERF_RECORD_FINISHED_ROUND:
633 return ops->finished_round(event, self, ops); 794 return ops->finished_round(event, session, ops);
634 default: 795 default:
635 ++self->hists.stats.nr_unknown_events; 796 return -EINVAL;
636 return -1;
637 } 797 }
638} 798}
639 799
800static int perf_session__process_event(struct perf_session *session,
801 union perf_event *event,
802 struct perf_event_ops *ops,
803 u64 file_offset)
804{
805 struct perf_sample sample;
806 int ret;
807
808 if (session->header.needs_swap &&
809 perf_event__swap_ops[event->header.type])
810 perf_event__swap_ops[event->header.type](event);
811
812 if (event->header.type >= PERF_RECORD_HEADER_MAX)
813 return -EINVAL;
814
815 hists__inc_nr_events(&session->hists, event->header.type);
816
817 if (event->header.type >= PERF_RECORD_USER_TYPE_START)
818 return perf_session__process_user_event(session, event, ops, file_offset);
819
820 /*
821 * For all kernel events we get the sample data
822 */
823 ret = perf_session__parse_sample(session, event, &sample);
824 if (ret)
825 return ret;
826
827 /* Preprocess sample records - precheck callchains */
828 if (perf_session__preprocess_sample(session, event, &sample))
829 return 0;
830
831 if (ops->ordered_samples) {
832 ret = perf_session_queue_event(session, event, &sample,
833 file_offset);
834 if (ret != -ETIME)
835 return ret;
836 }
837
838 return perf_session_deliver_event(session, event, &sample, ops,
839 file_offset);
840}
841
640void perf_event_header__bswap(struct perf_event_header *self) 842void perf_event_header__bswap(struct perf_event_header *self)
641{ 843{
642 self->type = bswap_32(self->type); 844 self->type = bswap_32(self->type);
@@ -656,21 +858,38 @@ static struct thread *perf_session__register_idle_thread(struct perf_session *se
656 return thread; 858 return thread;
657} 859}
658 860
659int do_read(int fd, void *buf, size_t size) 861static void perf_session__warn_about_errors(const struct perf_session *session,
862 const struct perf_event_ops *ops)
660{ 863{
661 void *buf_start = buf; 864 if (ops->lost == perf_event__process_lost &&
662 865 session->hists.stats.total_lost != 0) {
663 while (size) { 866 ui__warning("Processed %" PRIu64 " events and LOST %" PRIu64
664 int ret = read(fd, buf, size); 867 "!\n\nCheck IO/CPU overload!\n\n",
868 session->hists.stats.total_period,
869 session->hists.stats.total_lost);
870 }
665 871
666 if (ret <= 0) 872 if (session->hists.stats.nr_unknown_events != 0) {
667 return ret; 873 ui__warning("Found %u unknown events!\n\n"
874 "Is this an older tool processing a perf.data "
875 "file generated by a more recent tool?\n\n"
876 "If that is not the case, consider "
877 "reporting to linux-kernel@vger.kernel.org.\n\n",
878 session->hists.stats.nr_unknown_events);
879 }
668 880
669 size -= ret; 881 if (session->hists.stats.nr_unknown_id != 0) {
670 buf += ret; 882 ui__warning("%u samples with id not present in the header\n",
883 session->hists.stats.nr_unknown_id);
671 } 884 }
672 885
673 return buf - buf_start; 886 if (session->hists.stats.nr_invalid_chains != 0) {
887 ui__warning("Found invalid callchains!\n\n"
888 "%u out of %u events were discarded for this reason.\n\n"
889 "Consider reporting to linux-kernel@vger.kernel.org.\n\n",
890 session->hists.stats.nr_invalid_chains,
891 session->hists.stats.nr_events[PERF_RECORD_SAMPLE]);
892 }
674} 893}
675 894
676#define session_done() (*(volatile int *)(&session_done)) 895#define session_done() (*(volatile int *)(&session_done))
@@ -679,7 +898,7 @@ volatile int session_done;
679static int __perf_session__process_pipe_events(struct perf_session *self, 898static int __perf_session__process_pipe_events(struct perf_session *self,
680 struct perf_event_ops *ops) 899 struct perf_event_ops *ops)
681{ 900{
682 event_t event; 901 union perf_event event;
683 uint32_t size; 902 uint32_t size;
684 int skip = 0; 903 int skip = 0;
685 u64 head; 904 u64 head;
@@ -690,7 +909,7 @@ static int __perf_session__process_pipe_events(struct perf_session *self,
690 909
691 head = 0; 910 head = 0;
692more: 911more:
693 err = do_read(self->fd, &event, sizeof(struct perf_event_header)); 912 err = readn(self->fd, &event, sizeof(struct perf_event_header));
694 if (err <= 0) { 913 if (err <= 0) {
695 if (err == 0) 914 if (err == 0)
696 goto done; 915 goto done;
@@ -710,8 +929,7 @@ more:
710 p += sizeof(struct perf_event_header); 929 p += sizeof(struct perf_event_header);
711 930
712 if (size - sizeof(struct perf_event_header)) { 931 if (size - sizeof(struct perf_event_header)) {
713 err = do_read(self->fd, p, 932 err = readn(self->fd, p, size - sizeof(struct perf_event_header));
714 size - sizeof(struct perf_event_header));
715 if (err <= 0) { 933 if (err <= 0) {
716 if (err == 0) { 934 if (err == 0) {
717 pr_err("unexpected end of event stream\n"); 935 pr_err("unexpected end of event stream\n");
@@ -724,9 +942,8 @@ more:
724 } 942 }
725 943
726 if (size == 0 || 944 if (size == 0 ||
727 (skip = perf_session__process_event(self, &event, ops, 945 (skip = perf_session__process_event(self, &event, ops, head)) < 0) {
728 0, head)) < 0) { 946 dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n",
729 dump_printf("%#Lx [%#x]: skipping unknown header type: %d\n",
730 head, event.header.size, event.header.type); 947 head, event.header.size, event.header.type);
731 /* 948 /*
732 * assume we lost track of the stream, check alignment, and 949 * assume we lost track of the stream, check alignment, and
@@ -740,9 +957,6 @@ more:
740 957
741 head += size; 958 head += size;
742 959
743 dump_printf("\n%#Lx [%#x]: event: %d\n",
744 head, event.header.size, event.header.type);
745
746 if (skip > 0) 960 if (skip > 0)
747 head += skip; 961 head += skip;
748 962
@@ -751,82 +965,108 @@ more:
751done: 965done:
752 err = 0; 966 err = 0;
753out_err: 967out_err:
968 perf_session__warn_about_errors(self, ops);
969 perf_session_free_sample_buffers(self);
754 return err; 970 return err;
755} 971}
756 972
757int __perf_session__process_events(struct perf_session *self, 973static union perf_event *
974fetch_mmaped_event(struct perf_session *session,
975 u64 head, size_t mmap_size, char *buf)
976{
977 union perf_event *event;
978
979 /*
980 * Ensure we have enough space remaining to read
981 * the size of the event in the headers.
982 */
983 if (head + sizeof(event->header) > mmap_size)
984 return NULL;
985
986 event = (union perf_event *)(buf + head);
987
988 if (session->header.needs_swap)
989 perf_event_header__bswap(&event->header);
990
991 if (head + event->header.size > mmap_size)
992 return NULL;
993
994 return event;
995}
996
997int __perf_session__process_events(struct perf_session *session,
758 u64 data_offset, u64 data_size, 998 u64 data_offset, u64 data_size,
759 u64 file_size, struct perf_event_ops *ops) 999 u64 file_size, struct perf_event_ops *ops)
760{ 1000{
761 int err, mmap_prot, mmap_flags; 1001 u64 head, page_offset, file_offset, file_pos, progress_next;
762 u64 head, shift; 1002 int err, mmap_prot, mmap_flags, map_idx = 0;
763 u64 offset = 0; 1003 struct ui_progress *progress;
764 size_t page_size; 1004 size_t page_size, mmap_size;
765 event_t *event; 1005 char *buf, *mmaps[8];
1006 union perf_event *event;
766 uint32_t size; 1007 uint32_t size;
767 char *buf;
768 struct ui_progress *progress = ui_progress__new("Processing events...",
769 self->size);
770 if (progress == NULL)
771 return -1;
772 1008
773 perf_event_ops__fill_defaults(ops); 1009 perf_event_ops__fill_defaults(ops);
774 1010
775 page_size = sysconf(_SC_PAGESIZE); 1011 page_size = sysconf(_SC_PAGESIZE);
776 1012
777 head = data_offset; 1013 page_offset = page_size * (data_offset / page_size);
778 shift = page_size * (head / page_size); 1014 file_offset = page_offset;
779 offset += shift; 1015 head = data_offset - page_offset;
780 head -= shift; 1016
1017 if (data_offset + data_size < file_size)
1018 file_size = data_offset + data_size;
1019
1020 progress_next = file_size / 16;
1021 progress = ui_progress__new("Processing events...", file_size);
1022 if (progress == NULL)
1023 return -1;
1024
1025 mmap_size = session->mmap_window;
1026 if (mmap_size > file_size)
1027 mmap_size = file_size;
1028
1029 memset(mmaps, 0, sizeof(mmaps));
781 1030
782 mmap_prot = PROT_READ; 1031 mmap_prot = PROT_READ;
783 mmap_flags = MAP_SHARED; 1032 mmap_flags = MAP_SHARED;
784 1033
785 if (self->header.needs_swap) { 1034 if (session->header.needs_swap) {
786 mmap_prot |= PROT_WRITE; 1035 mmap_prot |= PROT_WRITE;
787 mmap_flags = MAP_PRIVATE; 1036 mmap_flags = MAP_PRIVATE;
788 } 1037 }
789remap: 1038remap:
790 buf = mmap(NULL, page_size * self->mmap_window, mmap_prot, 1039 buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, session->fd,
791 mmap_flags, self->fd, offset); 1040 file_offset);
792 if (buf == MAP_FAILED) { 1041 if (buf == MAP_FAILED) {
793 pr_err("failed to mmap file\n"); 1042 pr_err("failed to mmap file\n");
794 err = -errno; 1043 err = -errno;
795 goto out_err; 1044 goto out_err;
796 } 1045 }
1046 mmaps[map_idx] = buf;
1047 map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1);
1048 file_pos = file_offset + head;
797 1049
798more: 1050more:
799 event = (event_t *)(buf + head); 1051 event = fetch_mmaped_event(session, head, mmap_size, buf);
800 ui_progress__update(progress, offset); 1052 if (!event) {
801 1053 if (mmaps[map_idx]) {
802 if (self->header.needs_swap) 1054 munmap(mmaps[map_idx], mmap_size);
803 perf_event_header__bswap(&event->header); 1055 mmaps[map_idx] = NULL;
804 size = event->header.size; 1056 }
805 if (size == 0)
806 size = 8;
807
808 if (head + event->header.size >= page_size * self->mmap_window) {
809 int munmap_ret;
810
811 shift = page_size * (head / page_size);
812
813 munmap_ret = munmap(buf, page_size * self->mmap_window);
814 assert(munmap_ret == 0);
815 1057
816 offset += shift; 1058 page_offset = page_size * (head / page_size);
817 head -= shift; 1059 file_offset += page_offset;
1060 head -= page_offset;
818 goto remap; 1061 goto remap;
819 } 1062 }
820 1063
821 size = event->header.size; 1064 size = event->header.size;
822 1065
823 dump_printf("\n%#Lx [%#x]: event: %d\n",
824 offset + head, event->header.size, event->header.type);
825
826 if (size == 0 || 1066 if (size == 0 ||
827 perf_session__process_event(self, event, ops, offset, head) < 0) { 1067 perf_session__process_event(session, event, ops, file_pos) < 0) {
828 dump_printf("%#Lx [%#x]: skipping unknown header type: %d\n", 1068 dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n",
829 offset + head, event->header.size, 1069 file_offset + head, event->header.size,
830 event->header.type); 1070 event->header.type);
831 /* 1071 /*
832 * assume we lost track of the stream, check alignment, and 1072 * assume we lost track of the stream, check alignment, and
@@ -839,19 +1079,24 @@ more:
839 } 1079 }
840 1080
841 head += size; 1081 head += size;
1082 file_pos += size;
842 1083
843 if (offset + head >= data_offset + data_size) 1084 if (file_pos >= progress_next) {
844 goto done; 1085 progress_next += file_size / 16;
1086 ui_progress__update(progress, file_pos);
1087 }
845 1088
846 if (offset + head < file_size) 1089 if (file_pos < file_size)
847 goto more; 1090 goto more;
848done: 1091
849 err = 0; 1092 err = 0;
850 /* do the final flush for ordered samples */ 1093 /* do the final flush for ordered samples */
851 self->ordered_samples.next_flush = ULLONG_MAX; 1094 session->ordered_samples.next_flush = ULLONG_MAX;
852 flush_sample_queue(self, ops); 1095 flush_sample_queue(session, ops);
853out_err: 1096out_err:
854 ui_progress__delete(progress); 1097 ui_progress__delete(progress);
1098 perf_session__warn_about_errors(session, ops);
1099 perf_session_free_sample_buffers(session);
855 return err; 1100 return err;
856} 1101}
857 1102
@@ -929,3 +1174,91 @@ size_t perf_session__fprintf_dsos_buildid(struct perf_session *self, FILE *fp,
929 size_t ret = machine__fprintf_dsos_buildid(&self->host_machine, fp, with_hits); 1174 size_t ret = machine__fprintf_dsos_buildid(&self->host_machine, fp, with_hits);
930 return ret + machines__fprintf_dsos_buildid(&self->machines, fp, with_hits); 1175 return ret + machines__fprintf_dsos_buildid(&self->machines, fp, with_hits);
931} 1176}
1177
1178size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp)
1179{
1180 struct perf_evsel *pos;
1181 size_t ret = fprintf(fp, "Aggregated stats:\n");
1182
1183 ret += hists__fprintf_nr_events(&session->hists, fp);
1184
1185 list_for_each_entry(pos, &session->evlist->entries, node) {
1186 ret += fprintf(fp, "%s stats:\n", event_name(pos));
1187 ret += hists__fprintf_nr_events(&pos->hists, fp);
1188 }
1189
1190 return ret;
1191}
1192
1193struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
1194 unsigned int type)
1195{
1196 struct perf_evsel *pos;
1197
1198 list_for_each_entry(pos, &session->evlist->entries, node) {
1199 if (pos->attr.type == type)
1200 return pos;
1201 }
1202 return NULL;
1203}
1204
1205void perf_session__print_symbols(union perf_event *event,
1206 struct perf_sample *sample,
1207 struct perf_session *session)
1208{
1209 struct addr_location al;
1210 const char *symname, *dsoname;
1211 struct callchain_cursor *cursor = &session->callchain_cursor;
1212 struct callchain_cursor_node *node;
1213
1214 if (perf_event__preprocess_sample(event, session, &al, sample,
1215 NULL) < 0) {
1216 error("problem processing %d event, skipping it.\n",
1217 event->header.type);
1218 return;
1219 }
1220
1221 if (symbol_conf.use_callchain && sample->callchain) {
1222
1223 if (perf_session__resolve_callchain(session, al.thread,
1224 sample->callchain, NULL) != 0) {
1225 if (verbose)
1226 error("Failed to resolve callchain. Skipping\n");
1227 return;
1228 }
1229 callchain_cursor_commit(cursor);
1230
1231 while (1) {
1232 node = callchain_cursor_current(cursor);
1233 if (!node)
1234 break;
1235
1236 if (node->sym && node->sym->name)
1237 symname = node->sym->name;
1238 else
1239 symname = "";
1240
1241 if (node->map && node->map->dso && node->map->dso->name)
1242 dsoname = node->map->dso->name;
1243 else
1244 dsoname = "";
1245
1246 printf("\t%16" PRIx64 " %s (%s)\n", node->ip, symname, dsoname);
1247
1248 callchain_cursor_advance(cursor);
1249 }
1250
1251 } else {
1252 if (al.sym && al.sym->name)
1253 symname = al.sym->name;
1254 else
1255 symname = "";
1256
1257 if (al.map && al.map->dso && al.map->dso->name)
1258 dsoname = al.map->dso->name;
1259 else
1260 dsoname = "";
1261
1262 printf("%16" PRIx64 " %s (%s)", al.addr, symname, dsoname);
1263 }
1264}