Bug 1711128 - Rename GCRunnerActions: <MajorGC,MajorGCReady> -> <WaitToMajorGC, StartMajorGC> r=pbone,smaug

Differential Revision: https://phabricator.services.mozilla.com/D115095
This commit is contained in:
Steve Fink 2021-05-19 23:26:17 +00:00
Родитель 33cc754ee1
Коммит 976e686288
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -63,9 +63,9 @@ static const int64_t kNumCCNodesBetweenTimeChecks = 1000;
// Actions performed by the GCRunner state machine.
enum class GCRunnerAction {
MajorGC, // We want to start a new major GC
MajorGCReady, // The parent says we may begin our major GC
GCSlice, // Run a single slice of a major GC
WaitToMajorGC, // We want to start a new major GC
StartMajorGC, // The parent says we may begin our major GC
GCSlice, // Run a single slice of a major GC
None
};
@ -665,13 +665,13 @@ GCRunnerStep CCGCScheduler::GetNextGCRunnerAction(TimeStamp aDeadline) {
}
if (mReadyForMajorGC) {
GCRunnerStep step{GCRunnerAction::MajorGCReady, mMajorGCReason};
GCRunnerStep step{GCRunnerAction::StartMajorGC, mMajorGCReason};
mMajorGCReason = JS::GCReason::NO_REASON;
return step;
}
if (mMajorGCReason != JS::GCReason::NO_REASON) {
GCRunnerStep step{GCRunnerAction::MajorGC, mMajorGCReason};
GCRunnerStep step{GCRunnerAction::WaitToMajorGC, mMajorGCReason};
mMajorGCReason = JS::GCReason::NO_REASON;
return step;
}

Просмотреть файл

@ -1608,7 +1608,7 @@ bool GCRunnerFired(TimeStamp aDeadline, void* /* aClosure */) {
nsJSContext::KillGCRunner();
return false;
case GCRunnerAction::MajorGC: {
case GCRunnerAction::WaitToMajorGC: {
RefPtr<MayGCPromise> mbPromise = MayGCNow(step.mReason);
if (!mbPromise || mbPromise->IsResolved()) {
// Only use the promise if it's not resolved yet, otherwise fall through
@ -1638,7 +1638,7 @@ bool GCRunnerFired(TimeStamp aDeadline, void* /* aClosure */) {
return true;
}
case GCRunnerAction::MajorGCReady:
case GCRunnerAction::StartMajorGC:
case GCRunnerAction::GCSlice:
break;
}