diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:07:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:07:45 +0000 |
commit | 1db1869d020b5c0e93b98c90d2a50e279b84cbfc (patch) | |
tree | ff52905359cc3119eefdfdfd89ff245124845a77 /simpleperf/cmd_record.cpp | |
parent | f54eb34ca72437ad76314e8c2de0e8cd88f807a4 (diff) | |
parent | cd6b038e799ea13120e9676e0f1b23cdda4223db (diff) | |
download | extras-1db1869d020b5c0e93b98c90d2a50e279b84cbfc.tar.gz |
Snap for 8512216 from cd6b038e799ea13120e9676e0f1b23cdda4223db to tm-frc-scheduling-release
Change-Id: I53fbb8e30a613ff5b5d4ecaa372eb2f5e85a510c
Diffstat (limited to 'simpleperf/cmd_record.cpp')
-rw-r--r-- | simpleperf/cmd_record.cpp | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp index b84bcfab..4b79eedc 100644 --- a/simpleperf/cmd_record.cpp +++ b/simpleperf/cmd_record.cpp @@ -629,25 +629,26 @@ bool RecordCommand::PrepareRecording(Workload* workload) { } IOEventLoop* loop = event_selection_set_.GetIOEventLoop(); auto exit_loop_callback = [loop]() { return loop->ExitLoop(); }; - if (!loop->AddSignalEvents({SIGCHLD, SIGINT, SIGTERM}, exit_loop_callback)) { + if (!loop->AddSignalEvents({SIGCHLD, SIGINT, SIGTERM}, exit_loop_callback, IOEventHighPriority)) { return false; } // Only add an event for SIGHUP if we didn't inherit SIG_IGN (e.g. from nohup). if (!SignalIsIgnored(SIGHUP)) { - if (!loop->AddSignalEvent(SIGHUP, exit_loop_callback)) { + if (!loop->AddSignalEvent(SIGHUP, exit_loop_callback, IOEventHighPriority)) { return false; } } if (stop_signal_fd_ != -1) { - if (!loop->AddReadEvent(stop_signal_fd_, exit_loop_callback)) { + if (!loop->AddReadEvent(stop_signal_fd_, exit_loop_callback, IOEventHighPriority)) { return false; } } if (duration_in_sec_ != 0) { - if (!loop->AddPeriodicEvent(SecondToTimeval(duration_in_sec_), - [loop]() { return loop->ExitLoop(); })) { + if (!loop->AddPeriodicEvent( + SecondToTimeval(duration_in_sec_), [loop]() { return loop->ExitLoop(); }, + IOEventHighPriority)) { return false; } } @@ -718,9 +719,10 @@ bool RecordCommand::DoRecording(Workload* workload) { return false; } time_stat_.stop_recording_time = GetSystemClock(); - if (!event_selection_set_.FinishReadMmapEventData()) { + if (!event_selection_set_.SyncKernelBuffer()) { return false; } + event_selection_set_.CloseEventFiles(); time_stat_.finish_recording_time = GetSystemClock(); uint64_t recording_time = time_stat_.finish_recording_time - time_stat_.start_recording_time; LOG(INFO) << "Recorded for " << recording_time / 1e9 << " seconds. Start post processing."; @@ -754,26 +756,31 @@ static bool WriteRecordDataToOutFd(const std::string& in_filename, } bool RecordCommand::PostProcessRecording(const std::vector<std::string>& args) { - // 1. Merge map records dumped while recording by map record thread. + // 1. Read records left in the buffer. + if (!event_selection_set_.FinishReadMmapEventData()) { + return false; + } + + // 2. Merge map records dumped while recording by map record thread. if (map_record_thread_) { if (!map_record_thread_->Join() || !MergeMapRecords()) { return false; } } - // 2. Post unwind dwarf callchain. + // 3. Post unwind dwarf callchain. if (unwind_dwarf_callchain_ && post_unwind_) { if (!PostUnwindRecords()) { return false; } } - // 3. Optionally join Callchains. + // 4. Optionally join Callchains. if (callchain_joiner_) { JoinCallChains(); } - // 4. Dump additional features, and close record file. + // 5. Dump additional features, and close record file. if (!DumpAdditionalFeatures(args)) { return false; } @@ -785,7 +792,7 @@ bool RecordCommand::PostProcessRecording(const std::vector<std::string>& args) { } time_stat_.post_process_time = GetSystemClock(); - // 4. Show brief record result. + // 6. Show brief record result. auto record_stat = event_selection_set_.GetRecordStat(); if (event_selection_set_.HasAuxTrace()) { LOG(INFO) << "Aux data traced: " << record_stat.aux_data_size; @@ -1278,8 +1285,9 @@ bool RecordCommand::CreateAndInitRecordFile() { return false; } // Use first perf_event_attr and first event id to dump mmap and comm records. - EventAttrWithId dumping_attr_id = event_selection_set_.GetEventAttrWithId()[0]; - map_record_reader_.emplace(*dumping_attr_id.attr, dumping_attr_id.ids[0], + dumping_attr_id_ = event_selection_set_.GetEventAttrWithId()[0]; + CHECK(!dumping_attr_id_.ids.empty()); + map_record_reader_.emplace(*dumping_attr_id_.attr, dumping_attr_id_.ids[0], event_selection_set_.RecordNotExecutableMaps()); map_record_reader_->SetCallback([this](Record* r) { return ProcessRecord(r); }); @@ -1503,14 +1511,13 @@ bool RecordCommand::SaveRecordWithoutUnwinding(Record* record) { bool RecordCommand::ProcessJITDebugInfo(const std::vector<JITDebugInfo>& debug_info, bool sync_kernel_records) { - EventAttrWithId attr_id = event_selection_set_.GetEventAttrWithId()[0]; for (auto& info : debug_info) { if (info.type == JITDebugInfo::JIT_DEBUG_JIT_CODE) { uint64_t timestamp = jit_debug_reader_->SyncWithRecords() ? info.timestamp : last_record_timestamp_; - Mmap2Record record(*attr_id.attr, false, info.pid, info.pid, info.jit_code_addr, + Mmap2Record record(*dumping_attr_id_.attr, false, info.pid, info.pid, info.jit_code_addr, info.jit_code_len, info.file_offset, map_flags::PROT_JIT_SYMFILE_MAP, - info.file_path, attr_id.ids[0], timestamp); + info.file_path, dumping_attr_id_.ids[0], timestamp); if (!ProcessRecord(&record)) { return false; } @@ -1519,8 +1526,9 @@ bool RecordCommand::ProcessJITDebugInfo(const std::vector<JITDebugInfo>& debug_i ThreadMmap& map = *info.extracted_dex_file_map; uint64_t timestamp = jit_debug_reader_->SyncWithRecords() ? info.timestamp : last_record_timestamp_; - Mmap2Record record(*attr_id.attr, false, info.pid, info.pid, map.start_addr, map.len, - map.pgoff, map.prot, map.name, attr_id.ids[0], timestamp); + Mmap2Record record(*dumping_attr_id_.attr, false, info.pid, info.pid, map.start_addr, + map.len, map.pgoff, map.prot, map.name, dumping_attr_id_.ids[0], + timestamp); if (!ProcessRecord(&record)) { return false; } |