From 9a1f829db03dc9ad9701b4ddae1267d3140e84f4 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Tue, 16 Feb 2016 12:15:31 -0800 Subject: [PATCH] simpleperf: accept different perf_attr sizes. The size of perf_attr can be increased as new features are added. And we can accept different perf_attr sizes in perf.data, and ignore unknown features. Bug: 26962895 Change-Id: Ia42617f92acb3ab6ae56eb91aa0d7b73efc0b8af (cherry picked from commit dd2ae2878b7e5ac1754da55a08cbcdacadf53d78) --- simpleperf/record_file_reader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpleperf/record_file_reader.cpp b/simpleperf/record_file_reader.cpp index 1befc69f..f126a6b7 100644 --- a/simpleperf/record_file_reader.cpp +++ b/simpleperf/record_file_reader.cpp @@ -75,9 +75,8 @@ bool RecordFileReader::ReadHeader() { bool RecordFileReader::ReadAttrSection() { size_t attr_count = header_.attrs.size / header_.attr_size; if (header_.attr_size != sizeof(FileAttr)) { - LOG(WARNING) << "attr size (" << header_.attr_size << ") in " << filename_ + LOG(DEBUG) << "attr size (" << header_.attr_size << ") in " << filename_ << " doesn't match expected size (" << sizeof(FileAttr) << ")"; - return false; } if (attr_count == 0) { LOG(ERROR) << "no attr in file " << filename_; -- 2.11.0