summaryrefslogtreecommitdiff
path: root/simpleperf
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-01-30 22:25:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-01-30 22:25:04 +0000
commitf0b44ca74f06981b24807e1f6df86d630c29ff03 (patch)
treeab6ae4c923dc9dea85c582ad6480c56298a84a15 /simpleperf
parent7a2ab0d63e45809015b45c66bfbb14def9aaea37 (diff)
parent79ba9747aab1c787d510b12b72c921c13516f1a8 (diff)
downloadextras-f0b44ca74f06981b24807e1f6df86d630c29ff03.tar.gz
Merge "simpleperf: Relax auxtrace offset requirements." into main
Diffstat (limited to 'simpleperf')
-rw-r--r--simpleperf/record_file_reader.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/simpleperf/record_file_reader.cpp b/simpleperf/record_file_reader.cpp
index 1b1bab7e..deeab564 100644
--- a/simpleperf/record_file_reader.cpp
+++ b/simpleperf/record_file_reader.cpp
@@ -830,9 +830,8 @@ bool RecordFileReader::BuildAuxDataLocation() {
auto location_it = aux_data_location_.find(auxtrace.data->cpu);
if (location_it != aux_data_location_.end()) {
const AuxDataLocation& prev_location = location_it->second.back();
- uint64_t prev_aux_end = prev_location.aux_offset + prev_location.aux_size;
// The AuxTraceRecords should be sorted by aux_offset for each cpu.
- if (prev_aux_end > location.aux_offset) {
+ if (prev_location.aux_offset > location.aux_offset) {
LOG(ERROR) << "invalid auxtrace feature section";
return false;
}