Snap for 8701348 from a066ffe0299a26d19561fbaab2e654087fcac3ae to mainline-uwb-release
Change-Id: Ie728e5be0a972ce053997ccf83650ecc0efa1302
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp
index 4b79eed..e69355d 100644
--- a/simpleperf/cmd_record.cpp
+++ b/simpleperf/cmd_record.cpp
@@ -352,7 +352,8 @@
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::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 @@
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 @@
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() {
