diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-09 07:23:32 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-09 07:23:32 +0000 |
commit | e8f4f6a2a2c74ac8c45febd013cc3d1f326ca6bb (patch) | |
tree | f3f3abd005afd96c07379261e18a98cf40f3ee60 | |
parent | 27a153e6dc2cd533eda95aec5d192042feac6054 (diff) | |
parent | a066ffe0299a26d19561fbaab2e654087fcac3ae (diff) | |
download | extras-e8f4f6a2a2c74ac8c45febd013cc3d1f326ca6bb.tar.gz |
Snap for 8701348 from a066ffe0299a26d19561fbaab2e654087fcac3ae to mainline-tethering-releaseaml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150
Change-Id: Id5a6a709ec02577189a8a55486aeee512f10d095
-rw-r--r-- | simpleperf/cmd_record.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp index 4b79eedc..e69355d4 100644 --- a/simpleperf/cmd_record.cpp +++ b/simpleperf/cmd_record.cpp @@ -352,7 +352,8 @@ RECORD_FILTER_OPTION_HELP_MSG_FOR_RECORDING bool TraceOffCpu(); bool SetEventSelectionFlags(); bool CreateAndInitRecordFile(); - std::unique_ptr<RecordFileWriter> CreateRecordFile(const std::string& filename); + std::unique_ptr<RecordFileWriter> CreateRecordFile( + const std::string& filename, const std::vector<EventAttrWithId>& override_attrs); bool DumpKernelSymbol(); bool DumpTracingData(); bool DumpMaps(); @@ -1280,7 +1281,8 @@ bool RecordCommand::SetEventSelectionFlags() { } bool RecordCommand::CreateAndInitRecordFile() { - record_file_writer_ = CreateRecordFile(record_filename_); + record_file_writer_ = + CreateRecordFile(record_filename_, event_selection_set_.GetEventAttrWithId()); if (record_file_writer_ == nullptr) { return false; } @@ -1294,13 +1296,14 @@ bool RecordCommand::CreateAndInitRecordFile() { return DumpKernelSymbol() && DumpTracingData() && DumpMaps() && DumpAuxTraceInfo(); } -std::unique_ptr<RecordFileWriter> RecordCommand::CreateRecordFile(const std::string& filename) { +std::unique_ptr<RecordFileWriter> RecordCommand::CreateRecordFile( + const std::string& filename, const std::vector<EventAttrWithId>& attrs) { std::unique_ptr<RecordFileWriter> writer = RecordFileWriter::CreateInstance(filename); if (writer == nullptr) { return nullptr; } - if (!writer->WriteAttrSection(event_selection_set_.GetEventAttrWithId())) { + if (!writer->WriteAttrSection(attrs)) { return nullptr; } return writer; @@ -1697,11 +1700,17 @@ std::unique_ptr<RecordFileReader> RecordCommand::MoveRecordFile(const std::strin return nullptr; } } - record_file_writer_ = CreateRecordFile(record_filename_); + + auto reader = RecordFileReader::CreateInstance(old_filename); + if (!reader) { + return nullptr; + } + + record_file_writer_ = CreateRecordFile(record_filename_, reader->AttrSection()); if (!record_file_writer_) { return nullptr; } - return RecordFileReader::CreateInstance(old_filename); + return reader; } bool RecordCommand::MergeMapRecords() { |