Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1338347 - Refactor to group fields into a per-animation data structure. r=botond

Browse Source 
No functional changes here, just creating a struct that we will expand in the
next patch.

MozReview-Commit-ID: HlSSvtIuYU5

--HG--
extra : rebase_source : fca9ec13018f77fae97c6907a188ecbfb5104921
This commit is contained in:
Kartikaya Gupta 2017-03-20 11:41:05 -04:00
parent dc857723e6
commit a6036c3329
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/layers/composite/AnimationMetricsTracker.cpp
View File

@ -17,9 +17,6 @@ namespace layers {
AnimationMetricsTracker::AnimationMetricsTracker()
: mMaxLayerAreaAnimated(0)
, mChromeAnimationFrameCount(0)
, mContentAnimationFrameCount(0)
, mApzAnimationFrameCount(0)
{
}
@ -50,14 +47,12 @@ AnimationMetricsTracker::UpdateAnimationInProgress(AnimationProcessTypes aActive
UpdateAnimationThroughput("chrome",
(aActive & AnimationProcessTypes::eChrome) != AnimationProcessTypes::eNone,
mChromeAnimationStart,
mChromeAnimationFrameCount,
mChromeAnimation,
aVsyncInterval,
Telemetry::COMPOSITOR_ANIMATION_THROUGHPUT_CHROME);
UpdateAnimationThroughput("content",
(aActive & AnimationProcessTypes::eContent) != AnimationProcessTypes::eNone,
mContentAnimationStart,
mContentAnimationFrameCount,
mContentAnimation,
aVsyncInterval,
Telemetry::COMPOSITOR_ANIMATION_THROUGHPUT_CONTENT);
}
@ -68,8 +63,7 @@ AnimationMetricsTracker::UpdateApzAnimationInProgress(bool aInProgress,
{
UpdateAnimationThroughput("apz",
aInProgress,
mApzAnimationStart,
mApzAnimationFrameCount,
mApzAnimation,
aVsyncInterval,
Telemetry::COMPOSITOR_ANIMATION_THROUGHPUT_APZ);
}
@ -94,25 +88,24 @@ AnimationMetricsTracker::AnimationEnded()
void
AnimationMetricsTracker::UpdateAnimationThroughput(const char* aLabel,
bool aInProgress,
TimeStamp& aStartTime,
uint32_t& aFrameCount,
AnimationData& aAnimation,
TimeDuration aVsyncInterval,
Telemetry::HistogramID aHistogram)
{
if (aInProgress && !aStartTime) {
if (aInProgress && !aAnimation.mStart) {
// the animation just started
aStartTime = TimeStamp::Now();
aFrameCount = 1;
aAnimation.mStart = TimeStamp::Now();
aAnimation.mFrameCount = 1;
AMT_LOG("Compositor animation of type %s just started\n", aLabel);
} else if (aInProgress && aStartTime) {
} else if (aInProgress && aAnimation.mStart) {
// the animation continues
aFrameCount++;
} else if (!aInProgress && aStartTime) {
aAnimation.mFrameCount++;
} else if (!aInProgress && aAnimation.mStart) {
// the animation just ended
// Get the length and clear aStartTime before the early-returns below
TimeDuration animationLength = TimeStamp::Now() - aStartTime;
aStartTime = TimeStamp();
// Get the length and clear aAnimation.mStart before the early-returns below
TimeDuration animationLength = TimeStamp::Now() - aAnimation.mStart;
aAnimation.mStart = TimeStamp();
if (aVsyncInterval == TimeDuration::Forever()) {
AMT_LOG("Invalid vsync interval: forever\n");
@ -132,8 +125,8 @@ AnimationMetricsTracker::UpdateAnimationThroughput(const char* aLabel,
// from one composite to another.
uint32_t expectedFrameCount = std::lround(animationLength.ToMilliseconds() / vsyncIntervalMs);
AMT_LOG("Type %s ran for %fms (interval: %fms), %u frames (expected: %u)\n",
aLabel, animationLength.ToMilliseconds(), vsyncIntervalMs, aFrameCount,
expectedFrameCount);
aLabel, animationLength.ToMilliseconds(), vsyncIntervalMs,
aAnimation.mFrameCount, expectedFrameCount);
if (expectedFrameCount <= 0) {
// Graceful handling of probably impossible thing, unless the clock
// changes while running?
@ -142,7 +135,7 @@ AnimationMetricsTracker::UpdateAnimationThroughput(const char* aLabel,
// Scale up by 1000 because telemetry takes ints, truncate intentionally
// to avoid artificial inflation of the result.
uint32_t frameHitRatio = (uint32_t)(1000.0f * aFrameCount / expectedFrameCount);
uint32_t frameHitRatio = (uint32_t)(1000.0f * aAnimation.mFrameCount / expectedFrameCount);
Telemetry::Accumulate(aHistogram, frameHitRatio);
AMT_LOG("Reported frameHitRatio %u\n", frameHitRatio);
}

32
gfx/layers/composite/AnimationMetricsTracker.h
View File

@ -45,12 +45,24 @@ public:
void UpdateApzAnimationInProgress(bool aInProgress, TimeDuration aVsyncInterval);
private:
// A struct to group data that we need for each type of compositor animation.
struct AnimationData {
// The start time of the current animation.
TimeStamp mStart;
// The number of frames composited for the current animation.
uint32_t mFrameCount;
AnimationData()
: mFrameCount(0)
{
}
};
void AnimationStarted();
void AnimationEnded();
void UpdateAnimationThroughput(const char* aLabel,
bool aInProgress,
TimeStamp& aStartTime,
uint32_t& aFrameCount,
AnimationData& aAnimationData,
TimeDuration aVsyncInterval,
Telemetry::HistogramID aHistogram);
@ -62,18 +74,10 @@ private:
// has touched on any given animation frame.
uint64_t mMaxLayerAreaAnimated;
// The start time of the current chrome-process animation.
TimeStamp mChromeAnimationStart;
// The number of frames composited for the current chrome-process animation.
uint32_t mChromeAnimationFrameCount;
// The start time of the current content-process animation.
TimeStamp mContentAnimationStart;
// The number of frames composited for the current content-process animation.
uint32_t mContentAnimationFrameCount;
// The start time of the current APZ animation.
TimeStamp mApzAnimationStart;
// The number of frames composited for the current APZ animation.
uint32_t mApzAnimationFrameCount;
// We keep an instance of the struct for each type of compositor animation.
AnimationData mChromeAnimation;
AnimationData mContentAnimation;
AnimationData mApzAnimation;
};
} // namespace layers