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 913666, part 1 - Move cycle collector root logging into ScanRoots. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2013-09-10 16:33:39 -07:00
parent 395225224a
commit 7fc4e6d8a5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xpcom/base/nsCycleCollector.cpp
View File

@ -993,7 +993,7 @@ private:
void BeginCollection(ccType aCCType, nsICycleCollectorListener *aListener); void BeginCollection(ccType aCCType, nsICycleCollectorListener *aListener);
void MarkRoots(GCGraphBuilder &aBuilder); void MarkRoots(GCGraphBuilder &aBuilder);
void ScanRoots(); void ScanRoots(nsICycleCollectorListener *aListener);
void ScanWeakMaps(); void ScanWeakMaps();
// returns whether anything was collected // returns whether anything was collected
@ -2263,7 +2263,7 @@ nsCycleCollector::ScanWeakMaps()
} }
void void
nsCycleCollector::ScanRoots() nsCycleCollector::ScanRoots(nsICycleCollectorListener *aListener)
{ {
mWhiteNodeCount = 0; mWhiteNodeCount = 0;
@ -2279,6 +2279,21 @@ nsCycleCollector::ScanRoots()
} }
ScanWeakMaps(); ScanWeakMaps();
if (aListener) {
aListener->BeginResults();
NodePool::Enumerator etor(mGraph.mNodes);
while (!etor.IsDone()) {
PtrInfo *pi = etor.GetNext();
if (pi->mColor == black &&
pi->mRefCount > 0 && pi->mRefCount < UINT32_MAX &&
pi->mInternalRefs != pi->mRefCount) {
aListener->DescribeRoot((uint64_t)pi->mPointer,
pi->mInternalRefs);
}
}
}
} }
@ -2771,25 +2786,10 @@ nsCycleCollector::BeginCollection(ccType aCCType,
MarkRoots(builder); MarkRoots(builder);
timeLog.Checkpoint("MarkRoots()"); timeLog.Checkpoint("MarkRoots()");
ScanRoots(); ScanRoots(aListener);
timeLog.Checkpoint("ScanRoots()"); timeLog.Checkpoint("ScanRoots()");
mScanInProgress = false; mScanInProgress = false;
if (aListener) {
aListener->BeginResults();
NodePool::Enumerator etor(mGraph.mNodes);
while (!etor.IsDone()) {
PtrInfo *pi = etor.GetNext();
if (pi->mColor == black &&
pi->mRefCount > 0 && pi->mRefCount < UINT32_MAX &&
pi->mInternalRefs != pi->mRefCount) {
aListener->DescribeRoot((uint64_t)pi->mPointer,
pi->mInternalRefs);
}
}
}
} }
uint32_t uint32_t