Skip to content

[WIP] Fix for fiber root scheduling memory leak #11644

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

Merged
merged 2 commits into from
Nov 28, 2017
Merged

[WIP] Fix for fiber root scheduling memory leak #11644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b9442
Fix for root memory leak
trueadm Nov 23, 2017
f1d48f1
forgot to add code
trueadm Nov 23, 2017
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
38 changes: 24 additions & 14 deletions packages/react-reconciler/src/ReactFiberScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,27 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
return scheduleWorkImpl(fiber, expirationTime, false);
}

function checkRootNeedsClearing(
root: FiberRoot,
fiber: Fiber,
expirationTime: ExpirationTime,
) {
if (
!isWorking &&
root === nextRoot &&
expirationTime < nextRenderExpirationTime
) {
// Restart the root from the top.
if (nextUnitOfWork !== null) {
// This is an interruption. (Used for performance tracking.)
interruptedBy = fiber;
}
nextRoot = null;
nextUnitOfWork = null;
nextRenderExpirationTime = NoWork;
}
}

function scheduleWorkImpl(
fiber: Fiber,
expirationTime: ExpirationTime,
Expand Down Expand Up @@ -1203,21 +1224,10 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
if (node.return === null) {
if (node.tag === HostRoot) {
const root: FiberRoot = (node.stateNode: any);
if (
!isWorking &&
root === nextRoot &&
expirationTime < nextRenderExpirationTime
) {
// Restart the root from the top.
if (nextUnitOfWork !== null) {
// This is an interruption. (Used for performance tracking.)
interruptedBy = fiber;
}
nextRoot = null;
nextUnitOfWork = null;
nextRenderExpirationTime = NoWork;
}

checkRootNeedsClearing(root, fiber, expirationTime);
requestWork(root, expirationTime);
checkRootNeedsClearing(root, fiber, expirationTime);
} else {
if (__DEV__) {
if (!isErrorRecovery && fiber.tag === ClassComponent) {
Expand Down