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 935721, part 6 - Replace ccResults with aResults in EndCycleCollectionCallback. r=smaug

Browse Source 
This is done in a separate patch to reduce the size of the previous patch a bit.
This commit is contained in:
Andrew McCreight 2013-11-20 14:35:16 -08:00
parent 3eed280708
commit 8953ed7683
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dom/base/nsJSEnvironment.cpp
View File

@ -2086,8 +2086,7 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
{
MOZ_ASSERT(NS_IsMainThread());
CycleCollectorResults &ccResults = aResults; // temporary to reduce patch size
sCCollectedWaitingForGC += ccResults.mFreedRefCounted + ccResults.mFreedGCed;
sCCollectedWaitingForGC += aResults.mFreedRefCounted + aResults.mFreedGCed;
// If we collected a substantial amount of cycles, poke the GC since more objects
// might be unreachable now.
@ -2122,12 +2121,12 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
if (sPostGCEventsToConsole) {
nsCString mergeMsg;
if (ccResults.mMergedZones) {
if (aResults.mMergedZones) {
mergeMsg.AssignLiteral(" merged");
}
nsCString gcMsg;
if (ccResults.mForcedGC) {
if (aResults.mForcedGC) {
gcMsg.AssignLiteral(", forced a GC");
}
@ -2137,8 +2136,8 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
nsString msg;
msg.Adopt(nsTextFormatter::smprintf(kFmt.get(), double(delta) / PR_USEC_PER_SEC,
ccNowDuration, gCCStats.mSuspected,
ccResults.mVisitedRefCounted, ccResults.mVisitedGCed, mergeMsg.get(),
ccResults.mFreedRefCounted, ccResults.mFreedGCed,
aResults.mVisitedRefCounted, aResults.mVisitedGCed, mergeMsg.get(),
aResults.mFreedRefCounted, aResults.mFreedGCed,
sCCollectedWaitingForGC, sLikelyShortLivingObjectsNeedingGC,
gcMsg.get(),
sForgetSkippableBeforeCC,
@ -2184,11 +2183,11 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
ccNowDuration, gCCStats.mMaxGCDuration,
gCCStats.mMaxSkippableDuration,
gCCStats.mSuspected,
ccResults.mVisitedRefCounted, ccResults.mVisitedGCed,
ccResults.mFreedRefCounted, ccResults.mFreedGCed,
aResults.mVisitedRefCounted, aResults.mVisitedGCed,
aResults.mFreedRefCounted, aResults.mFreedGCed,
sCCollectedWaitingForGC,
sLikelyShortLivingObjectsNeedingGC,
ccResults.mForcedGC,
aResults.mForcedGC,
sForgetSkippableBeforeCC,
minForgetSkippableTime / PR_USEC_PER_MSEC,
sMaxForgetSkippableTime / PR_USEC_PER_MSEC,