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

Reverse the meaning of suspectCurrentCount and rename it to expectedGarbageCount. (Bug 488603) r+sr=peterv

Browse Source
This commit is contained in:
L. David Baron 2009-04-24 15:45:34 -07:00
parent 23e03f54d1
commit 1d193a2b78
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xpcom/base/nsCycleCollector.cpp
View File

@ -2556,20 +2556,21 @@ nsCycleCollector::ExplainLiveExpectedGarbage()
{
GCGraphBuilder builder(mGraph, mRuntimes);
// Instead of adding roots from the purple buffer, we add them
// from the list of nodes we were expected to collect.
// Put the expected garbage in *before* calling
// BeginCycleCollection so that we can separate the expected
// garbage from the NoteRoot calls in such a way that something
// that's in both is considered expected garbage.
mExpectedGarbage.EnumerateEntries(&AddExpectedGarbage, &builder);
PRUint32 expectedGarbageCount = builder.Count();
for (PRUint32 i = 0; i <= nsIProgrammingLanguage::MAX; ++i) {
if (mRuntimes[i])
mRuntimes[i]->BeginCycleCollection(builder);
}
// This might fail to explain expected garbage that's also in
// the set of roots added by the runtimes (what used to be
// called suspectCurrent), but that seems pretty unlikely.
PRUint32 suspectCurrentCount = builder.Count();
// Instead of adding roots from the purple buffer, we add them
// from the list of nodes we were expected to collect.
mExpectedGarbage.EnumerateEntries(&AddExpectedGarbage, &builder);
MarkRoots(builder);
ScanRoots();
@ -2586,7 +2587,12 @@ nsCycleCollector::ExplainLiveExpectedGarbage()
findCycleRoots = PR_TRUE;
}
if (pi->mInternalRefs != pi->mRefCount && i >= suspectCurrentCount) {
if (pi->mInternalRefs != pi->mRefCount &&
(i < expectedGarbageCount || i >= mGraph.mRootCount)) {
// This check isn't particularly useful anymore
// given that we need to enter this part for i >=
// mGraph.mRootCount and there are plenty of
// NoteRoot roots.
describeExtraRefcounts = PR_TRUE;
}
++i;
@ -2614,7 +2620,7 @@ nsCycleCollector::ExplainLiveExpectedGarbage()
NodePool::Enumerator etor_roots(mGraph.mNodes);
for (PRUint32 i = 0; i < mGraph.mRootCount; ++i) {
PtrInfo *root_pi = etor_roots.GetNext();
if (i >= suspectCurrentCount) {
if (i < expectedGarbageCount) {
root_pi->mSCCIndex = INDEX_REACHED;
root_pi->mShortestPathToExpectedGarbage = root_pi;
queue.Push(root_pi);