perf session: Simplify termination checks
A message that is not in the archive (sent off-list or not yet received): [email protected]
Commit-ID: d6513281c5f728d138ba895d600b9788e51508b1 Gitweb: http://git.kernel.org/tip/d6513281c5f728d138ba895d600b9788e51508b1 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 30 Nov 2010 17:49:44 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 30 Nov 2010 19:58:10 -0200
perf session: Simplify termination checks
No need to check twice.
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/session.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
tools/perf/util/session.c +11 -9
@@ -738,7 +738,7 @@ int __perf_session__process_events(struct perf_session *session, u64 data_offset, u64 data_size, 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;struct ui_progress *progress;size_t page_size;
@@ -758,6 +758,9 @@ int __perf_session__process_events(struct perf_session *session, file_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_flags =MAP_SHARED ;
@@ -773,6 +776,7 @@ remap: err = -errno; goto out_err; } + file_pos = file_offset + head;ui_progress__update (progress, file_offset); more:
@@ -799,10 +803,10 @@ more: size = event->header.size;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, - file_offset + head) <0 ) { +if (size ==0 || +perf_session__process_event (session, event, ops, file_pos) <0 ) {dump_printf ("%#Lx [%#x]: skipping unknown header type: %d\n" , file_offset + head, event->header.size, event->header.type);
@@ -817,13 +821,11 @@ more: } head += size; + file_pos += size; -if (file_offset + head >= data_offset + data_size) - goto done; - -if (file_offset + head < file_size) +if (file_pos < file_size) goto more; -done: + err =0 ;/* do the final flush for ordered samples */ session->ordered_samples.next_flush =ULLONG_MAX ;