leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf session: Simplify termination checks

Browse Source 
No need to check twice.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20101130163820.152886642@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Thomas Gleixner 2010-11-30 17:49:44 +00:00 committed by Arnaldo Carvalho de Melo
parent 85b99952cc
commit d6513281c5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/util/session.c
View File

@ -738,7 +738,7 @@ int __perf_session__process_events(struct perf_session *session,
u64 data_offset, u64 data_size, u64 data_offset, u64 data_size,
u64 file_size, struct perf_event_ops *ops) u64 file_size, struct perf_event_ops *ops)
{ {
u64 head, page_offset, file_offset; u64 head, page_offset, file_offset, file_pos;
int err, mmap_prot, mmap_flags; int err, mmap_prot, mmap_flags;
struct ui_progress *progress; struct ui_progress *progress;
size_t page_size; size_t page_size;
@ -758,6 +758,9 @@ int __perf_session__process_events(struct perf_session *session,
file_offset = page_offset; file_offset = page_offset;
head = data_offset - page_offset; head = data_offset - page_offset;
if (data_offset + data_size < file_size)
file_size = data_offset + data_size;
mmap_prot = PROT_READ; mmap_prot = PROT_READ;
mmap_flags = MAP_SHARED; mmap_flags = MAP_SHARED;
@ -773,6 +776,7 @@ remap:
err = -errno; err = -errno;
goto out_err; goto out_err;
} }
file_pos = file_offset + head;
ui_progress__update(progress, file_offset); ui_progress__update(progress, file_offset);
more: more:
@ -799,10 +803,10 @@ more:
size = event->header.size; size = event->header.size;
dump_printf("\n%#Lx [%#x]: event: %d\n", dump_printf("\n%#Lx [%#x]: event: %d\n",
file_offset + head, event->header.size, event->header.type); file_pos, event->header.size, event->header.type);
if (size == 0 || perf_session__process_event(session, event, ops, if (size == 0 ||
file_offset + head) < 0) { perf_session__process_event(session, event, ops, file_pos) < 0) {
dump_printf("%#Lx [%#x]: skipping unknown header type: %d\n", dump_printf("%#Lx [%#x]: skipping unknown header type: %d\n",
file_offset + head, event->header.size, file_offset + head, event->header.size,
event->header.type); event->header.type);
@ -817,13 +821,11 @@ more:
} }
head += size; head += size;
file_pos += size;
if (file_offset + head >= data_offset + data_size) if (file_pos < file_size)
goto done;
if (file_offset + head < file_size)
goto more; goto more;
done:
err = 0; err = 0;
/* do the final flush for ordered samples */ /* do the final flush for ordered samples */
session->ordered_samples.next_flush = ULLONG_MAX; session->ordered_samples.next_flush = ULLONG_MAX;