wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 937751, part 6 - Allocate the current MarkRoots node on the heap rather than the stack. r=smaug

Browse Source 
To make nsCycleCollector::MarkRoots incremental, we have to store all of its state on
the heap, so we can resume it.  The only remaining state to convert is the NodePool
enumerator.
This commit is contained in:
Andrew McCreight 2013-12-03 10:47:47 -08:00
parent f2778b1f8a
commit a04a9c127e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xpcom/base/nsCycleCollector.cpp
View File

@ -1020,6 +1020,7 @@ class nsCycleCollector : public MemoryMultiReporter
ccPhase mIncrementalPhase;
GCGraph mGraph;
nsAutoPtr<GCGraphBuilder> mBuilder;
nsAutoPtr<NodePool::Enumerator> mCurrNode;
nsCOMPtr<nsICycleCollectorListener> mListener;
nsIThread* mThread;
@ -2217,14 +2218,13 @@ nsCycleCollector::MarkRoots()
MOZ_ASSERT(!mScanInProgress);
mScanInProgress = true;
MOZ_ASSERT(mIncrementalPhase == GraphBuildingPhase);
MOZ_ASSERT(mCurrNode);
// read the PtrInfo out of the graph that we are building
NodePool::Enumerator queue(mGraph.mNodes);
while (!queue.IsDone()) {
PtrInfo *pi = queue.GetNext();
while (!mCurrNode->IsDone()) {
PtrInfo *pi = mCurrNode->GetNext();
CC_AbortIfNull(pi);
mBuilder->Traverse(pi);
if (queue.AtBlockEnd()) {
if (mCurrNode->AtBlockEnd()) {
mBuilder->SetLastChild();
}
}
@ -2238,6 +2238,7 @@ nsCycleCollector::MarkRoots()
}
mBuilder = nullptr;
mCurrNode = nullptr;
mIncrementalPhase = ScanAndCollectWhitePhase;
timeLog.Checkpoint("MarkRoots()");
}
@ -2902,6 +2903,7 @@ nsCycleCollector::BeginCollection(ccType aCCType,
// We've finished adding roots, and everything in the graph is a root.
mGraph.mRootCount = mGraph.MapCount();
mCurrNode = new NodePool::Enumerator(mGraph.mNodes);
mIncrementalPhase = GraphBuildingPhase;
}