Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass "start time" and "commit time" to Profiler callback #12852

Merged
merged 6 commits into from May 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/react-reconciler/src/ReactFiber.js
Expand Up @@ -460,10 +460,13 @@ export function createFiberFromProfiler(
const fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
fiber.type = REACT_PROFILER_TYPE;
fiber.expirationTime = expirationTime;
fiber.stateNode = {
duration: 0,
startTime: 0,
};
if (enableProfilerTimer) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can shave off a bit by not even initializing stateNode for Profiler unless we're actually going to use it for timing.

fiber.stateNode = {
elapsedPauseTimeAtStart: 0,
duration: 0,
startTime: 0,
};
}

return fiber;
}
Expand Down
3 changes: 3 additions & 0 deletions packages/react-reconciler/src/ReactFiberCommitWork.js
Expand Up @@ -20,6 +20,7 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
import type {CapturedValue, CapturedError} from './ReactCapturedValue';

import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
import {getCommitTime} from './ReactProfilerTimer';
import {
ClassComponent,
HostRoot,
Expand Down Expand Up @@ -807,6 +808,8 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {
current === null ? 'mount' : 'update',
finishedWork.stateNode.duration,
finishedWork.treeBaseTime,
finishedWork.stateNode.startTime,
getCommitTime(),
);

// Reset actualTime after successful commit.
Expand Down
5 changes: 5 additions & 0 deletions packages/react-reconciler/src/ReactFiberScheduler.js
Expand Up @@ -104,6 +104,7 @@ import {popHostContext, popHostContainer} from './ReactFiberHostContext';
import {
checkActualRenderTimeStackEmpty,
pauseActualRenderTimerIfRunning,
recordCommitTime,
recordElapsedBaseRenderTimeIfRunning,
resetActualRenderTimer,
resumeActualRenderTimerIfPaused,
Expand Down Expand Up @@ -566,6 +567,10 @@ function commitRoot(finishedWork: Fiber): ExpirationTime {
}
stopCommitSnapshotEffectsTimer();

if (enableProfilerTimer) {
recordCommitTime();
}

// Commit all the side-effects within a tree. We'll do this in two passes.
// The first pass performs all the host insertions, updates, deletions and
// ref unmounts.
Expand Down
42 changes: 32 additions & 10 deletions packages/react-reconciler/src/ReactProfilerTimer.js
Expand Up @@ -14,25 +14,40 @@ import {enableProfilerTimer} from 'shared/ReactFeatureFlags';
import warning from 'fbjs/lib/warning';
import {now} from './ReactFiberHostConfig';

/**
* The "actual" render time is total time required to render the descendants of a Profiler component.
* This time is stored as a stack, since Profilers can be nested.
* This time is started during the "begin" phase and stopped during the "complete" phase.
* It is paused (and accumulated) in the event of an interruption or an aborted render.
*/

export type ProfilerTimer = {
checkActualRenderTimeStackEmpty(): void,
getCommitTime(): number,
markActualRenderTimeStarted(fiber: Fiber): void,
pauseActualRenderTimerIfRunning(): void,
recordElapsedActualRenderTime(fiber: Fiber): void,
resetActualRenderTimer(): void,
resumeActualRenderTimerIfPaused(): void,
recordCommitTime(): void,
recordElapsedBaseRenderTimeIfRunning(fiber: Fiber): void,
startBaseRenderTimer(): void,
stopBaseRenderTimerIfRunning(): void,
};

let commitTime: number = 0;

function getCommitTime(): number {
return commitTime;
}

function recordCommitTime(): void {
if (!enableProfilerTimer) {
return;
}
commitTime = now();
}

/**
* The "actual" render time is total time required to render the descendants of a Profiler component.
* This time is stored as a stack, since Profilers can be nested.
* This time is started during the "begin" phase and stopped during the "complete" phase.
* It is paused (and accumulated) in the event of an interruption or an aborted render.
*/

let fiberStack: Array<Fiber | null>;

if (__DEV__) {
Expand Down Expand Up @@ -61,7 +76,9 @@ function markActualRenderTimeStarted(fiber: Fiber): void {
if (__DEV__) {
fiberStack.push(fiber);
}
fiber.stateNode.startTime = now() - totalElapsedPauseTime;
const stateNode = fiber.stateNode;
stateNode.elapsedPauseTimeAtStart = totalElapsedPauseTime;
stateNode.startTime = now();
}

function pauseActualRenderTimerIfRunning(): void {
Expand All @@ -80,8 +97,11 @@ function recordElapsedActualRenderTime(fiber: Fiber): void {
if (__DEV__) {
warning(fiber === fiberStack.pop(), 'Unexpected Fiber popped.');
}
fiber.stateNode.duration +=
now() - totalElapsedPauseTime - fiber.stateNode.startTime;
const stateNode = fiber.stateNode;
stateNode.duration +=
now() -
(totalElapsedPauseTime - stateNode.elapsedPauseTimeAtStart) -
stateNode.startTime;
}

function resetActualRenderTimer(): void {
Expand Down Expand Up @@ -145,8 +165,10 @@ function stopBaseRenderTimerIfRunning(): void {

export {
checkActualRenderTimeStackEmpty,
getCommitTime,
markActualRenderTimeStarted,
pauseActualRenderTimerIfRunning,
recordCommitTime,
recordElapsedActualRenderTime,
resetActualRenderTimer,
resumeActualRenderTimerIfPaused,
Expand Down