Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1126865 - Use an enum to indicate GC phase finished / yield to mutator result r=sfink

Browse Source
This commit is contained in:
Jon Coppeard 2015-01-29 09:58:06 +00:00
parent 6d14a65c84
commit ac04492e87
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,6 +820,12 @@ class GCRuntime
void releaseHeldRelocatedArenas();
private:
enum IncrementalProgress
{
NotFinished = 0,
Finished
};
void minorGCImpl(JS::gcreason::Reason reason, Nursery::TypeObjectList *pretenureTypes);
// For ArenaLists::allocateFromArena()
@ -860,7 +866,7 @@ class GCRuntime
bool shouldPreserveJITCode(JSCompartment *comp, int64_t currentTime,
JS::gcreason::Reason reason);
void bufferGrayRoots();
bool drainMarkStack(SliceBudget &sliceBudget, gcstats::Phase phase);
IncrementalProgress drainMarkStack(SliceBudget &sliceBudget, gcstats::Phase phase);
template <class CompartmentIterT> void markWeakReferences(gcstats::Phase phase);
void markWeakReferencesInCurrentGroup(gcstats::Phase phase);
template <class ZoneIterT, class CompartmentIterT> void markGrayReferences(gcstats::Phase phase);
@ -876,7 +882,7 @@ class GCRuntime
void beginSweepingZoneGroup();
bool shouldReleaseObservedTypes();
void endSweepingZoneGroup();
bool sweepPhase(SliceBudget &sliceBudget);
IncrementalProgress sweepPhase(SliceBudget &sliceBudget);
void endSweepPhase(bool lastGC);
void sweepZones(FreeOp *fop, bool lastGC);
void decommitAllWithoutUnlocking(const AutoLockGC &lock);
@ -886,7 +892,7 @@ class GCRuntime
void sweepBackgroundThings(ZoneList &zones, LifoAlloc &freeBlocks, ThreadType threadType);
void assertBackgroundSweepingFinished();
bool shouldCompact();
bool compactPhase(bool lastGC);
IncrementalProgress compactPhase(bool lastGC);
void sweepTypesAfterCompacting(Zone *zone);
void sweepZoneAfterCompacting(Zone *zone);
ArenaHeader *relocateArenas();

52
js/src/jsgc.cpp
View File

@ -5152,12 +5152,12 @@ ArenaLists::foregroundFinalize(FreeOp *fop, AllocKind thingKind, SliceBudget &sl
return true;
}
bool
GCRuntime::IncrementalProgress
GCRuntime::drainMarkStack(SliceBudget &sliceBudget, gcstats::Phase phase)
{
/* Run a marking slice and return whether the stack is now empty. */
gcstats::AutoPhase ap(stats, phase);
return marker.drainMarkStack(sliceBudget);
return marker.drainMarkStack(sliceBudget) ? Finished : NotFinished;
}
static void
@ -5197,15 +5197,15 @@ SweepArenaList(ArenaHeader **arenasToSweep, SliceBudget &sliceBudget, Args... ar
return true;
}
bool
GCRuntime::IncrementalProgress
GCRuntime::sweepPhase(SliceBudget &sliceBudget)
{
gcstats::AutoPhase ap(stats, gcstats::PHASE_SWEEP);
FreeOp fop(rt);
bool finished = drainMarkStack(sliceBudget, gcstats::PHASE_SWEEP_MARK);
if (!finished)
return false;
if (drainMarkStack(sliceBudget, gcstats::PHASE_SWEEP_MARK) == NotFinished)
return NotFinished;
for (;;) {
// Sweep dead type information stored in scripts and type objects, but
@ -5225,12 +5225,12 @@ GCRuntime::sweepPhase(SliceBudget &sliceBudget)
types::AutoClearTypeInferenceStateOnOOM oom(sweepZone);
if (!SweepArenaList<JSScript>(&al.gcScriptArenasToUpdate, sliceBudget, &oom))
return false;
return NotFinished;
if (!SweepArenaList<types::TypeObject>(
&al.gcTypeObjectArenasToUpdate, sliceBudget, &oom))
{
return false;
return NotFinished;
}
// Finish sweeping type information in the zone.
@ -5265,7 +5265,7 @@ GCRuntime::sweepPhase(SliceBudget &sliceBudget)
if (!zone->arenas.foregroundFinalize(&fop, kind, sliceBudget,
incrementalSweepList))
return false; /* Yield to the mutator. */
return NotFinished;
/* Reset the slots of the sweep list that we used. */
incrementalSweepList.reset(thingsPerArena);
@ -5285,17 +5285,18 @@ GCRuntime::sweepPhase(SliceBudget &sliceBudget)
ArenaLists &al = sweepZone->arenas;
if (!SweepArenaList<Shape>(&al.gcShapeArenasToUpdate, sliceBudget))
return false; /* Yield to the mutator. */
return NotFinished;
if (!SweepArenaList<AccessorShape>(&al.gcAccessorShapeArenasToUpdate, sliceBudget))
return false; /* Yield to the mutator. */
return NotFinished;
}
}
endSweepingZoneGroup();
getNextZoneGroup();
if (!currentZoneGroup)
return true; /* We're finished. */
return Finished;
endMarkingZoneGroup();
beginSweepingZoneGroup();
}
@ -5415,7 +5416,7 @@ GCRuntime::endSweepPhase(bool lastGC)
#endif
}
bool
GCRuntime::IncrementalProgress
GCRuntime::compactPhase(bool lastGC)
{
gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT);
@ -5424,7 +5425,7 @@ GCRuntime::compactPhase(bool lastGC)
// Poll for end of background sweeping
AutoLockGC lock(rt);
if (isBackgroundSweeping())
return false;
return NotFinished;
} else {
waitBackgroundSweepEnd();
}
@ -5482,7 +5483,7 @@ GCRuntime::compactPhase(bool lastGC)
}
}
#endif
return true;
return Finished;
}
void
@ -5801,15 +5802,14 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
/* fall through */
case MARK: {
case MARK:
/* If we needed delayed marking for gray roots, then collect until done. */
if (!marker.hasBufferedGrayRoots()) {
budget.makeUnlimited();
isIncremental = false;
}
bool finished = drainMarkStack(budget, gcstats::PHASE_MARK);
if (!finished)
if (drainMarkStack(budget, gcstats::PHASE_MARK) == NotFinished)
break;
MOZ_ASSERT(marker.isDrained());
@ -5845,14 +5845,10 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
break;
/* fall through */
}
case SWEEP:
{
bool finished = sweepPhase(budget);
if (!finished)
break;
}
if (sweepPhase(budget) == NotFinished)
break;
endSweepPhase(lastGC);
@ -5863,12 +5859,8 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
break;
case COMPACT:
if (shouldCompact()) {
bool finished = compactPhase(lastGC);
if (!finished)
break;
}
if (shouldCompact() && compactPhase(lastGC) == NotFinished)
break;
finishCollection();
incrementalState = NO_INCREMENTAL;
break;