diff options
author | Ryan Zuklie <rzuklie@google.com> | 2022-06-03 17:57:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-03 17:57:37 +0000 |
commit | e2de85bb493dcb8946fb68bca3693047616c60ae (patch) | |
tree | a35169e3976956c4aff376c07e7eb5d0692454d4 | |
parent | 040aa0787561c70ef3e11a28c4bc90d76ab98670 (diff) | |
parent | b0e8d3487597d77464edf4f837bb47a51c6aa005 (diff) | |
download | extras-e2de85bb493dcb8946fb68bca3693047616c60ae.tar.gz |
Merge "populate attributes when re-writing perf data" am: 0695b96133 am: b0e8d34875
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2113793
Change-Id: I0bce114634f9d8a90430111eb098cd7c3d02e510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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() { |