From e979f6778bd919479cd1ede6d03817e5795294bb Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Mon, 16 Apr 2012 20:42:51 +0200
Subject: [PATCH] --- yaml --- r: 304915 b: refs/heads/master c:
 9389a46043c8f091dc8f8d8e25a5c1355f8bcc9b h: refs/heads/master i:   304913:
 e753dc173afa0a443486af003aa0355b6753f53c   304911:
 5b4ab88d80f242acc9beeb95a3c311d2834f6de7 v: v3

---
 [refs]                          |  2 +-
 trunk/tools/perf/util/session.c | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 37dad0201f91..3a4bb23f358a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc41b9b8f02dbe2228ae787d525dac43beebb7fa
+refs/heads/master: 9389a46043c8f091dc8f8d8e25a5c1355f8bcc9b
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
index 9412e3b05f68..f992ae3c7e30 100644
--- a/trunk/tools/perf/util/session.c
+++ b/trunk/tools/perf/util/session.c
@@ -1100,16 +1100,10 @@ static int __perf_session__process_pipe_events(struct perf_session *self,
 	}
 
 	if ((skip = perf_session__process_event(self, &event, tool, head)) < 0) {
-		dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n",
-			    head, event.header.size, event.header.type);
-		/*
-		 * assume we lost track of the stream, check alignment, and
-		 * increment a single u64 in the hope to catch on again 'soon'.
-		 */
-		if (unlikely(head & 7))
-			head &= ~7ULL;
-
-		size = 8;
+		pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
+		       head, event.header.size, event.header.type);
+		err = -EINVAL;
+		goto out_err;
 	}
 
 	head += size;
@@ -1218,17 +1212,11 @@ int __perf_session__process_events(struct perf_session *session,
 
 	if (size == 0 ||
 	    perf_session__process_event(session, event, tool, file_pos) < 0) {
-		dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n",
-			    file_offset + head, event->header.size,
-			    event->header.type);
-		/*
-		 * assume we lost track of the stream, check alignment, and
-		 * increment a single u64 in the hope to catch on again 'soon'.
-		 */
-		if (unlikely(head & 7))
-			head &= ~7ULL;
-
-		size = 8;
+		pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
+		       file_offset + head, event->header.size,
+		       event->header.type);
+		err = -EINVAL;
+		goto out_err;
 	}
 
 	head += size;