DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Frame timings clone fix (flutter/engine#27751)

Browse Source
This commit is contained in:
Jim Graham 2021-07-27 18:44:02 -07:00 committed by GitHub
parent d002b4067d
commit 69211de5c2
2 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/flow/frame_timings.cc
View File

@ -136,6 +136,7 @@ std::unique_ptr<FrameTimingsRecorder> FrameTimingsRecorder::CloneUntil(
std::scoped_lock state_lock(state_mutex_);
std::unique_ptr<FrameTimingsRecorder> recorder =
std::make_unique<FrameTimingsRecorder>(frame_number_);
FML_DCHECK(state_ >= state);
recorder->state_ = state;
if (state >= State::kVsync) {
@ -147,7 +148,7 @@ std::unique_ptr<FrameTimingsRecorder> FrameTimingsRecorder::CloneUntil(
recorder->build_start_ = build_start_;
}
if (state >= State::kRasterEnd) {
if (state >= State::kBuildEnd) {
recorder->build_end_ = build_end_;
}
@ -157,6 +158,7 @@ std::unique_ptr<FrameTimingsRecorder> FrameTimingsRecorder::CloneUntil(
if (state >= State::kRasterEnd) {
recorder->raster_end_ = raster_end_;
recorder->raster_end_wall_time_ = raster_end_wall_time_;
}
return recorder;

81
engine/src/flutter/flow/frame_timings_recorder_unittests.cc
View File

@ -106,11 +106,90 @@ TEST(FrameTimingsRecorderTest, RecordersHaveUniqueFrameNumbers) {
TEST(FrameTimingsRecorderTest, ClonedHasSameFrameNumber) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
auto cloned =
recorder->CloneUntil(FrameTimingsRecorder::State::kUninitialized);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
}
TEST(FrameTimingsRecorderTest, ClonedHasSameVsyncStartAndTarget) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
const auto now = fml::TimePoint::Now();
recorder->RecordVsync(now, now);
recorder->RecordVsync(now, now + fml::TimeDelta::FromMilliseconds(16));
auto cloned = recorder->CloneUntil(FrameTimingsRecorder::State::kVsync);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
ASSERT_EQ(recorder->GetVsyncStartTime(), cloned->GetVsyncStartTime());
ASSERT_EQ(recorder->GetVsyncTargetTime(), cloned->GetVsyncTargetTime());
}
TEST(FrameTimingsRecorderTest, ClonedHasSameBuildStart) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
const auto now = fml::TimePoint::Now();
recorder->RecordVsync(now, now + fml::TimeDelta::FromMilliseconds(16));
recorder->RecordBuildStart(fml::TimePoint::Now());
auto cloned = recorder->CloneUntil(FrameTimingsRecorder::State::kBuildStart);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
ASSERT_EQ(recorder->GetVsyncStartTime(), cloned->GetVsyncStartTime());
ASSERT_EQ(recorder->GetVsyncTargetTime(), cloned->GetVsyncTargetTime());
ASSERT_EQ(recorder->GetBuildStartTime(), cloned->GetBuildStartTime());
}
TEST(FrameTimingsRecorderTest, ClonedHasSameBuildEnd) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
const auto now = fml::TimePoint::Now();
recorder->RecordVsync(now, now + fml::TimeDelta::FromMilliseconds(16));
recorder->RecordBuildStart(fml::TimePoint::Now());
recorder->RecordBuildEnd(fml::TimePoint::Now());
auto cloned = recorder->CloneUntil(FrameTimingsRecorder::State::kBuildEnd);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
ASSERT_EQ(recorder->GetVsyncStartTime(), cloned->GetVsyncStartTime());
ASSERT_EQ(recorder->GetVsyncTargetTime(), cloned->GetVsyncTargetTime());
ASSERT_EQ(recorder->GetBuildStartTime(), cloned->GetBuildStartTime());
ASSERT_EQ(recorder->GetBuildEndTime(), cloned->GetBuildEndTime());
}
TEST(FrameTimingsRecorderTest, ClonedHasSameRasterStart) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
const auto now = fml::TimePoint::Now();
recorder->RecordVsync(now, now + fml::TimeDelta::FromMilliseconds(16));
recorder->RecordBuildStart(fml::TimePoint::Now());
recorder->RecordBuildEnd(fml::TimePoint::Now());
recorder->RecordRasterStart(fml::TimePoint::Now());
auto cloned = recorder->CloneUntil(FrameTimingsRecorder::State::kRasterStart);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
ASSERT_EQ(recorder->GetVsyncStartTime(), cloned->GetVsyncStartTime());
ASSERT_EQ(recorder->GetVsyncTargetTime(), cloned->GetVsyncTargetTime());
ASSERT_EQ(recorder->GetBuildStartTime(), cloned->GetBuildStartTime());
ASSERT_EQ(recorder->GetBuildEndTime(), cloned->GetBuildEndTime());
ASSERT_EQ(recorder->GetRasterStartTime(), cloned->GetRasterStartTime());
}
TEST(FrameTimingsRecorderTest, ClonedHasSameRasterEnd) {
auto recorder = std::make_unique<FrameTimingsRecorder>();
const auto now = fml::TimePoint::Now();
recorder->RecordVsync(now, now + fml::TimeDelta::FromMilliseconds(16));
recorder->RecordBuildStart(fml::TimePoint::Now());
recorder->RecordBuildEnd(fml::TimePoint::Now());
recorder->RecordRasterStart(fml::TimePoint::Now());
recorder->RecordRasterEnd();
auto cloned = recorder->CloneUntil(FrameTimingsRecorder::State::kRasterEnd);
ASSERT_EQ(recorder->GetFrameNumber(), cloned->GetFrameNumber());
ASSERT_EQ(recorder->GetVsyncStartTime(), cloned->GetVsyncStartTime());
ASSERT_EQ(recorder->GetVsyncTargetTime(), cloned->GetVsyncTargetTime());
ASSERT_EQ(recorder->GetBuildStartTime(), cloned->GetBuildStartTime());
ASSERT_EQ(recorder->GetBuildEndTime(), cloned->GetBuildEndTime());
ASSERT_EQ(recorder->GetRasterStartTime(), cloned->GetRasterStartTime());
ASSERT_EQ(recorder->GetRasterEndTime(), cloned->GetRasterEndTime());
ASSERT_EQ(recorder->GetRasterEndWallTime(), cloned->GetRasterEndWallTime());
}
TEST(FrameTimingsRecorderTest, FrameNumberTraceArgIsValid) {