Home » Mailing list archives » linux-kernel » 2010 » December » 1

[tip:perf/core] perf session: Simplify termination checks

Previous thread: [tip:perf/core] perf session: Move ui_progress_update in __perf_session__process_events() by tip-bot for Thomas Gleixner on Wednesday, December 1, 2010 - 2:11 am. (1 message)

Next thread: [tip:perf/core] perf session: Use sensible mmap size by tip-bot for Thomas Gleixner on Wednesday, December 1, 2010 - 2:12 am. (1 message)
[view original message]
From: tip-bot for Thomas Gleixner
Subject: [tip:perf/core] perf session: Simplify termination checks
Date: Wednesday, December 1, 2010 - 2:11 am

Commit-ID:  d6513281c5f728d138ba895d600b9788e51508b1
Gitweb:     http://git.kernel.org/tip/d6513281c5f728d138ba895d600b9788e51508b1
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 30 Nov 2010 17:49:44 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 30 Nov 2010 19:58:10 -0200

perf session: Simplify termination checks

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>
---
 tools/perf/util/session.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 3c140da..9c806ab 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -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 ...
[ message continues ]
Previous thread: [tip:perf/core] perf session: Move ui_progress_update in __perf_session__process_events() by tip-bot for Thomas Gleixner on Wednesday, December 1, 2010 - 2:11 am. (1 message)

Next thread: [tip:perf/core] perf session: Use sensible mmap size by tip-bot for Thomas Gleixner on Wednesday, December 1, 2010 - 2:12 am. (1 message)