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.

Sign up for GitHub

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

Remove timeout from performance flamegraph #15477

Merged
merged 1 commit into from
Apr 23, 2019
Merged

Remove timeout from performance flamegraph #15477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions packages/react-reconciler/src/ReactDebugFiberPerf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,16 +248,15 @@ export function startRequestCallbackTimer(): void {
}
}

export function stopRequestCallbackTimer(
didExpire: boolean,
expirationTime: number,
): void {
export function stopRequestCallbackTimer(didExpire: boolean): void {
if (enableUserTimingAPI) {
if (supportsUserTiming) {
isWaitingForCallback = false;
const warning = didExpire ? 'React was blocked by main thread' : null;
const warning = didExpire
? 'Update expired; will flush synchronously'
: null;
endMark(
`(Waiting for async callback... will force flush in ${expirationTime} ms)`,
'(Waiting for async callback...)',
'(Waiting for async callback...)',
warning,
);
Expand Down
3 changes: 1 addition & 2 deletions packages/react-reconciler/src/ReactFiberScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,7 @@ function renderRoot(

if (enableUserTimingAPI && expirationTime !== Sync) {
const didExpire = isSync;
const timeoutMs = expirationTimeToMs(expirationTime);
stopRequestCallbackTimer(didExpire, timeoutMs);
stopRequestCallbackTimer(didExpire);
}

if (root.firstPendingTime < expirationTime) {
Expand Down
60 changes: 30 additions & 30 deletions ...s/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Mount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -15,7 +15,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
⚛ (Calling Lifecycle Methods: 1 Total)
⚛ AllLifecycles.componentDidMount

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Update
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -31,7 +31,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
⚛ (Calling Lifecycle Methods: 2 Total)
⚛ AllLifecycles.componentDidUpdate

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Unmount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -45,7 +45,7 @@ exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
`;

exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduce overhead 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// The commit phase should mention A and B just once
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -62,7 +62,7 @@ exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduc
⚛ A.componentDidUpdate
⚛ B.componentDidUpdate

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Because of deduplication, we don't know B was cascading,
// but we should still see the warning for the commit phase.
Expand Down Expand Up @@ -92,7 +92,7 @@ exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduc
`;

exports[`ReactDebugFiberPerf does not include ConcurrentMode, StrictMode, or Profiler components in measurements 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Mount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -108,7 +108,7 @@ exports[`ReactDebugFiberPerf does not include ConcurrentMode, StrictMode, or Pro
`;

exports[`ReactDebugFiberPerf does not include context provider or consumer in measurements 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Mount
⚛ (React Tree Reconciliation: Completed Root)
Expand Down Expand Up @@ -143,7 +143,7 @@ exports[`ReactDebugFiberPerf does not schedule an extra callback if setState is
`;

exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascading 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Should not print a warning
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -156,7 +156,7 @@ exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascadi
⚛ (Committing Host Effects: 1 Total)
⚛ (Calling Lifecycle Methods: 0 Total)

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Should not print a warning
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -172,7 +172,7 @@ exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascadi
`;

exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Mount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -184,7 +184,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
⚛ (Committing Host Effects: 1 Total)
⚛ (Calling Lifecycle Methods: 0 Total)

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Update
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -196,7 +196,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
⚛ (Committing Host Effects: 2 Total)
⚛ (Calling Lifecycle Methods: 2 Total)

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Unmount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -209,7 +209,7 @@ exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
`;

exports[`ReactDebugFiberPerf measures deferred work in chunks 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Start rendering through B
⚛ (React Tree Reconciliation: Yielded)
Expand All @@ -218,7 +218,7 @@ exports[`ReactDebugFiberPerf measures deferred work in chunks 1`] = `
⚛ Child [mount]
⚛ B [mount]

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Complete the rest
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -245,7 +245,7 @@ exports[`ReactDebugFiberPerf measures deprioritized work 1`] = `
⚛ (Committing Host Effects: 1 Total)
⚛ (Calling Lifecycle Methods: 0 Total)

⚛ (Waiting for async callback... will force flush in 10737418210 ms)
⚛ (Waiting for async callback...)

// Flush the child
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -259,7 +259,7 @@ exports[`ReactDebugFiberPerf measures deprioritized work 1`] = `
`;

exports[`ReactDebugFiberPerf properly displays the forwardRef component in measurements 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Mount
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -279,7 +279,7 @@ exports[`ReactDebugFiberPerf properly displays the forwardRef component in measu
`;

exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Stop on Baddie and restart from Boundary
⚛ (React Tree Reconciliation: Completed Root)
Expand Down Expand Up @@ -313,7 +313,7 @@ exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
`;

exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Will fatal
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -329,7 +329,7 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
⚛ (Committing Host Effects: 1 Total)
⚛ (Calling Lifecycle Methods: 1 Total)

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

// Will reconcile from a clean state
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -344,7 +344,7 @@ exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
`;

exports[`ReactDebugFiberPerf skips parents during setState 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Should include just A and B, no Parents
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -359,7 +359,7 @@ exports[`ReactDebugFiberPerf skips parents during setState 1`] = `
`;

exports[`ReactDebugFiberPerf supports Suspense and lazy 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Completed Root)
⚛ Parent [mount]
Expand All @@ -370,15 +370,15 @@ exports[`ReactDebugFiberPerf supports Suspense and lazy 1`] = `
`;

exports[`ReactDebugFiberPerf supports Suspense and lazy 2`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Completed Root)
⚛ Parent [mount]
⛔ Suspense [mount] Warning: Rendering was suspended
⚛ Suspense [mount]
⚛ Spinner [mount]

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Completed Root)
⚛ Parent [mount]
Expand All @@ -393,7 +393,7 @@ exports[`ReactDebugFiberPerf supports Suspense and lazy 2`] = `
`;

exports[`ReactDebugFiberPerf supports memo 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Completed Root)
⚛ Parent [mount]
Expand All @@ -407,7 +407,7 @@ exports[`ReactDebugFiberPerf supports memo 1`] = `
`;

exports[`ReactDebugFiberPerf supports portals 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Completed Root)
⚛ Parent [mount]
Expand All @@ -421,12 +421,12 @@ exports[`ReactDebugFiberPerf supports portals 1`] = `
`;

exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

⚛ (React Tree Reconciliation: Yielded)
⚛ Foo [mount]

⚛ (Waiting for async callback... will force flush in 5250 ms)
⚛ (Waiting for async callback...)
⛔ (React Tree Reconciliation: Completed Root) Warning: A top-level update interrupted the previous render
⚛ Foo [mount]
⚛ (Committing Changes)
Expand All @@ -444,7 +444,7 @@ exports[`ReactDebugFiberPerf warns if an in-progress update is interrupted 1`] =
`;

exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
"⛔ (Waiting for async callback... will force flush in 5250 ms) Warning: React was blocked by main thread
"⛔ (Waiting for async callback...) Warning: Update expired; will flush synchronously

⚛ (Committing Changes)
⚛ (Committing Snapshot Effects: 0 Total)
Expand All @@ -454,7 +454,7 @@ exports[`ReactDebugFiberPerf warns if async work expires (starvation) 1`] = `
`;

exports[`ReactDebugFiberPerf warns on cascading renders from setState 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Should print a warning
⚛ (React Tree Reconciliation: Completed Root)
Expand All @@ -478,7 +478,7 @@ exports[`ReactDebugFiberPerf warns on cascading renders from setState 1`] = `
`;

exports[`ReactDebugFiberPerf warns on cascading renders from top-level render 1`] = `
"⚛ (Waiting for async callback... will force flush in 5250 ms)
"⚛ (Waiting for async callback...)

// Rendering the first root
⚛ (React Tree Reconciliation: Completed Root)
Expand Down