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 1084651 - Part 6: Rename SliceBudget::reset to the less misleading makeUnlimited. r=billm

Browse Source
This commit is contained in:
Emanuel Hoogeveen 2014-11-04 07:35:00 +01:00
parent 1b5561e45d
commit 774adccd1e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/public/SliceBudget.h
View File

@ -49,7 +49,7 @@ struct JS_PUBLIC_API(SliceBudget)
/* Instantiate as SliceBudget(WorkBudget(n)). */
explicit SliceBudget(WorkBudget work);
void reset() {
void makeUnlimited() {
deadline = unlimitedDeadline;
counter = unlimitedStartCounter;
}

22
js/src/jsgc.cpp
View File

@ -2932,13 +2932,13 @@ GCRuntime::refillFreeListInGC(Zone *zone, AllocKind thingKind)
SliceBudget::SliceBudget()
{
reset();
makeUnlimited();
}
SliceBudget::SliceBudget(TimeBudget time)
{
if (time.budget < 0) {
reset();
makeUnlimited();
} else {
// Note: TimeBudget(0) is equivalent to WorkBudget(CounterReset).
deadline = PRMJ_Now() + time.budget * PRMJ_USEC_PER_MSEC;
@ -2949,7 +2949,7 @@ SliceBudget::SliceBudget(TimeBudget time)
SliceBudget::SliceBudget(WorkBudget work)
{
if (work.budget < 0) {
reset();
makeUnlimited();
} else {
deadline = 0;
counter = work.budget;
@ -5663,7 +5663,7 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
* Yields between slices occurs at predetermined points in these modes;
* the budget is not used.
*/
budget.reset();
budget.makeUnlimited();
}
if (incrementalState == NO_INCREMENTAL) {
@ -5695,7 +5695,7 @@ GCRuntime::incrementalCollectSlice(SliceBudget &budget, JS::gcreason::Reason rea
case MARK: {
/* If we needed delayed marking for gray roots, then collect until done. */
if (!marker.hasBufferedGrayRoots()) {
budget.reset();
budget.makeUnlimited();
isIncremental = false;
}
@ -5785,27 +5785,27 @@ GCRuntime::budgetIncrementalGC(SliceBudget &budget)
IncrementalSafety safe = IsIncrementalGCSafe(rt);
if (!safe) {
resetIncrementalGC(safe.reason());
budget.reset();
budget.makeUnlimited();
stats.nonincremental(safe.reason());
return;
}
if (mode != JSGC_MODE_INCREMENTAL) {
resetIncrementalGC("GC mode change");
budget.reset();
budget.makeUnlimited();
stats.nonincremental("GC mode");
return;
}
if (isTooMuchMalloc()) {
budget.reset();
budget.makeUnlimited();
stats.nonincremental("malloc bytes trigger");
}
bool reset = false;
for (ZonesIter zone(rt, WithAtoms); !zone.done(); zone.next()) {
if (zone->usage.gcBytes() >= zone->threshold.gcTriggerBytes()) {
budget.reset();
budget.makeUnlimited();
stats.nonincremental("allocation trigger");
}
@ -5816,7 +5816,7 @@ GCRuntime::budgetIncrementalGC(SliceBudget &budget)
}
if (zone->isTooMuchMalloc()) {
budget.reset();
budget.makeUnlimited();
stats.nonincremental("malloc bytes trigger");
}
}
@ -5916,7 +5916,7 @@ GCRuntime::gcCycle(bool incremental, SliceBudget &budget, JSGCInvocationKind gck
resetIncrementalGC("requested");
stats.nonincremental("requested");
budget.reset();
budget.makeUnlimited();
} else {
budgetIncrementalGC(budget);
}