aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/util/session.c30
1 files changed, 9 insertions, 21 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 9412e3b05f68..f992ae3c7e30 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1100,16 +1100,10 @@ more:
1100 } 1100 }
1101 1101
1102 if ((skip = perf_session__process_event(self, &event, tool, head)) < 0) { 1102 if ((skip = perf_session__process_event(self, &event, tool, head)) < 0) {
1103 dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n", 1103 pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
1104 head, event.header.size, event.header.type); 1104 head, event.header.size, event.header.type);
1105 /* 1105 err = -EINVAL;
1106 * assume we lost track of the stream, check alignment, and 1106 goto out_err;
1107 * increment a single u64 in the hope to catch on again 'soon'.
1108 */
1109 if (unlikely(head & 7))
1110 head &= ~7ULL;
1111
1112 size = 8;
1113 } 1107 }
1114 1108
1115 head += size; 1109 head += size;
@@ -1218,17 +1212,11 @@ more:
1218 1212
1219 if (size == 0 || 1213 if (size == 0 ||
1220 perf_session__process_event(session, event, tool, file_pos) < 0) { 1214 perf_session__process_event(session, event, tool, file_pos) < 0) {
1221 dump_printf("%#" PRIx64 " [%#x]: skipping unknown header type: %d\n", 1215 pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
1222 file_offset + head, event->header.size, 1216 file_offset + head, event->header.size,
1223 event->header.type); 1217 event->header.type);
1224 /* 1218 err = -EINVAL;
1225 * assume we lost track of the stream, check alignment, and 1219 goto out_err;
1226 * increment a single u64 in the hope to catch on again 'soon'.
1227 */
1228 if (unlikely(head & 7))
1229 head &= ~7ULL;
1230
1231 size = 8;
1232 } 1220 }
1233 1221
1234 head += size; 1222 head += size;