Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1519794 - Reset incremental GC on allocation triggers that happen late in an incremental collection r=sfink

Browse Source
This commit is contained in:
Jon Coppeard 2019-01-14 18:59:27 +00:00
parent 9a48b50d31
commit 05f6ff93cf
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/gc/GC.cpp
View File

@ -7249,9 +7249,12 @@ GCRuntime::IncrementalResult GCRuntime::budgetIncrementalGC(
if (mallocCounter.shouldTriggerGC(tunables) == NonIncrementalTrigger) {
budget.makeUnlimited();
stats().nonincremental(AbortReason::MallocBytesTrigger);
if (isIncrementalGCInProgress() && state() > State::Sweep) {
return resetIncrementalGC(AbortReason::MallocBytesTrigger);
}
}
bool reset = false;
AbortReason resetReason = AbortReason::None;
for (ZonesIter zone(rt, WithAtoms); !zone.done(); zone.next()) {
if (!zone->canCollect()) {
continue;
@ -7261,23 +7264,29 @@ GCRuntime::IncrementalResult GCRuntime::budgetIncrementalGC(
CheckZoneIsScheduled(zone, reason, "GC bytes");
budget.makeUnlimited();
stats().nonincremental(AbortReason::GCBytesTrigger);
if (zone->wasGCStarted() && zone->gcState() > Zone::Sweep) {
resetReason = AbortReason::GCBytesTrigger;
}
}
if (zone->shouldTriggerGCForTooMuchMalloc() == NonIncrementalTrigger) {
CheckZoneIsScheduled(zone, reason, "malloc bytes");
budget.makeUnlimited();
stats().nonincremental(AbortReason::MallocBytesTrigger);
if (zone->wasGCStarted() && zone->gcState() > Zone::Sweep) {
resetReason = AbortReason::MallocBytesTrigger;
}
}
if (isIncrementalGCInProgress() &&
zone->isGCScheduled() != zone->wasGCStarted()) {
reset = true;
budget.makeUnlimited();
resetReason = AbortReason::ZoneChange;
}
}
if (reset) {
budget.makeUnlimited();
return resetIncrementalGC(AbortReason::ZoneChange);
if (resetReason != AbortReason::None) {
return resetIncrementalGC(resetReason);
}
return IncrementalResult::Ok;
@ -7631,6 +7640,15 @@ void GCRuntime::collect(bool nonincrementalByAPI, SliceBudget budget,
}
} while (repeat);
#ifdef DEBUG
if (!isIncrementalGCInProgress()) {
for (ZonesIter zone(rt, WithAtoms); zone.done(); zone.next()) {
MOZ_ASSERT(!zone->gcMallocCounter.triggered());
MOZ_ASSERT(!zone->jitCodeCounter.triggered());
}
}
#endif
if (reason == JS::gcreason::COMPARTMENT_REVIVED) {
maybeDoCycleCollection();
}