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 1125101 - Check budget in incremental compaction r=terrence

Browse Source
This commit is contained in:
Jon Coppeard 2015-02-26 12:35:59 +00:00
parent 371c95f018
commit 003c7e8ce6
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,11 +924,11 @@ class GCRuntime
void assertBackgroundSweepingFinished();
bool shouldCompact();
IncrementalProgress beginCompactPhase();
IncrementalProgress compactPhase(JS::gcreason::Reason reason);
IncrementalProgress compactPhase(JS::gcreason::Reason reason, SliceBudget &sliceBudget);
void endCompactPhase(JS::gcreason::Reason reason);
void sweepTypesAfterCompacting(Zone *zone);
void sweepZoneAfterCompacting(Zone *zone);
bool relocateArenas(Zone *zone, JS::gcreason::Reason reason);
bool relocateArenas(Zone *zone, JS::gcreason::Reason reason, SliceBudget &sliceBudget);
void updateAllCellPointersParallel(MovingTracer *trc, Zone *zone);
void updateAllCellPointersSerial(MovingTracer *trc, Zone *zone);
void updatePointersToRelocatedCells(Zone *zone);

25
js/src/jsgc.cpp
View File

@ -1997,7 +1997,7 @@ RelocateCell(Zone *zone, TenuredCell *src, AllocKind thingKind, size_t thingSize
}
static void
RelocateArena(ArenaHeader *aheader)
RelocateArena(ArenaHeader *aheader, SliceBudget &sliceBudget)
{
MOZ_ASSERT(aheader->allocated());
MOZ_ASSERT(!aheader->hasDelayedMarking);
@ -2016,6 +2016,7 @@ RelocateArena(ArenaHeader *aheader)
// for.
CrashAtUnhandlableOOM("Could not allocate new arena while compacting");
}
sliceBudget.step();
}
#ifdef DEBUG
@ -2034,14 +2035,14 @@ RelocateArena(ArenaHeader *aheader)
* relocate each cell within it, then add it to a list of relocated arenas.
*/
ArenaHeader *
ArenaList::relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated,
ArenaList::relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated, SliceBudget &sliceBudget,
gcstats::Statistics& stats)
{
check();
while (ArenaHeader *arena = toRelocate) {
toRelocate = arena->next;
RelocateArena(arena);
RelocateArena(arena, sliceBudget);
// Prepend to list of relocated arenas
arena->next = relocated;
relocated = arena;
@ -2070,7 +2071,7 @@ static bool ShouldRelocateZone(size_t arenaCount, size_t relocCount, JS::gcreaso
bool
ArenaLists::relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason reason,
gcstats::Statistics& stats)
SliceBudget &sliceBudget, gcstats::Statistics& stats)
{
// This is only called from the main thread while we are doing a GC, so
@ -2089,7 +2090,7 @@ ArenaLists::relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason
ArenaList &al = arenaLists[i];
ArenaHeader *allArenas = al.head();
al.clear();
relocatedListOut = al.relocateArenas(allArenas, relocatedListOut, stats);
relocatedListOut = al.relocateArenas(allArenas, relocatedListOut, sliceBudget, stats);
}
}
} else {
@ -2110,7 +2111,7 @@ ArenaLists::relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason
if (toRelocate[i]) {
ArenaList &al = arenaLists[i];
ArenaHeader *arenas = al.removeRemainingArenas(toRelocate[i]);
relocatedListOut = al.relocateArenas(arenas, relocatedListOut, stats);
relocatedListOut = al.relocateArenas(arenas, relocatedListOut, sliceBudget, stats);
}
}
}
@ -2126,7 +2127,7 @@ ArenaLists::relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason
}
bool
GCRuntime::relocateArenas(Zone *zone, JS::gcreason::Reason reason)
GCRuntime::relocateArenas(Zone *zone, JS::gcreason::Reason reason, SliceBudget &sliceBudget)
{
gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT_MOVE);
@ -2135,7 +2136,7 @@ GCRuntime::relocateArenas(Zone *zone, JS::gcreason::Reason reason)
jit::StopAllOffThreadCompilations(zone);
if (!zone->arenas.relocateArenas(relocatedArenasToRelease, reason, stats))
if (!zone->arenas.relocateArenas(relocatedArenasToRelease, reason, sliceBudget, stats))
return false;
#ifdef DEBUG
@ -5311,7 +5312,7 @@ GCRuntime::beginCompactPhase()
}
GCRuntime::IncrementalProgress
GCRuntime::compactPhase(JS::gcreason::Reason reason)
GCRuntime::compactPhase(JS::gcreason::Reason reason, SliceBudget &sliceBudget)
{
MOZ_ASSERT(rt->gc.nursery.isEmpty());
assertBackgroundSweepingFinished();
@ -5322,12 +5323,14 @@ GCRuntime::compactPhase(JS::gcreason::Reason reason)
while (!zonesToMaybeCompact.isEmpty()) {
Zone *zone = zonesToMaybeCompact.front();
MOZ_ASSERT(zone->isGCFinished());
if (relocateArenas(zone, reason)) {
if (relocateArenas(zone, reason, sliceBudget)) {
zone->setGCState(Zone::Compact);
updatePointersToRelocatedCells(zone);
zone->setGCState(Zone::Finished);
}
zonesToMaybeCompact.removeFront();
if (sliceBudget.isOverBudget())
break;
}
#ifdef DEBUG
@ -5770,7 +5773,7 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
if (!startedCompacting && beginCompactPhase() == NotFinished)
break;
if (compactPhase(reason) == NotFinished)
if (compactPhase(reason, budget) == NotFinished)
break;
endCompactPhase(reason);

4
js/src/jsgc.h
View File

@ -480,7 +480,7 @@ class ArenaList {
ArenaHeader *removeRemainingArenas(ArenaHeader **arenap);
ArenaHeader **pickArenasToRelocate(size_t &arenaTotalOut, size_t &relocTotalOut);
ArenaHeader *relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated,
gcstats::Statistics& stats);
SliceBudget &sliceBudget, gcstats::Statistics& stats);
};
/*
@ -802,7 +802,7 @@ class ArenaLists
}
bool relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason reason,
gcstats::Statistics& stats);
SliceBudget &sliceBudget, gcstats::Statistics& stats);
void queueForegroundObjectsForSweep(FreeOp *fop);
void queueForegroundThingsForSweep(FreeOp *fop);