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 1135141 - Make LAST_DITCH GC more robust; r=jonco

Browse Source
This commit is contained in:
Terrence Cole 2015-02-23 11:15:43 -08:00
parent ff59bf2cae
commit 0cf27b9008
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/gc/GCRuntime.h
View File

@ -921,7 +921,7 @@ class GCRuntime
void protectRelocatedArenas(ArenaHeader *relocatedList);
void unprotectRelocatedArenas(ArenaHeader *relocatedList);
#endif
void finishCollection();
void finishCollection(JS::gcreason::Reason reason);
void computeNonIncrementalMarkingForValidation();
void validateIncrementalMarking();

11
js/src/jsgc.cpp
View File

@ -5546,7 +5546,7 @@ GCRuntime::compactPhase(bool lastGC, JS::gcreason::Reason reason)
}
void
GCRuntime::finishCollection()
GCRuntime::finishCollection(JS::gcreason::Reason reason)
{
MOZ_ASSERT(marker.isDrained());
marker.stop();
@ -5566,6 +5566,13 @@ GCRuntime::finishCollection()
}
lastGCTime = currentTime;
// If this is an OOM GC reason, wait on the background sweeping thread
// before returning to ensure that we free as much as possible.
if (reason == JS::gcreason::LAST_DITCH || reason == JS::gcreason::MEM_PRESSURE) {
gcstats::AutoPhase ap(stats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
rt->gc.waitBackgroundSweepOrAllocEnd();
}
}
/* Start a new heap session. */
@ -5933,7 +5940,7 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
if (isCompacting && compactPhase(lastGC, reason) == NotFinished)
break;
finishCollection();
finishCollection(reason);
incrementalState = NO_INCREMENTAL;
break;