зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 92cde451be94 (bug 1444013) for failures in tests/dom/media/tests/crashtests/1453030.html
This commit is contained in:
Родитель
eb6f1b40ff
Коммит
10ffb9dea8
|
@ -89,11 +89,6 @@ class JS_PUBLIC_API(SliceBudget)
|
||||||
bool isTimeBudget() const { return !deadline.IsNull() && !isUnlimited(); }
|
bool isTimeBudget() const { return !deadline.IsNull() && !isUnlimited(); }
|
||||||
bool isUnlimited() const { return deadline == unlimitedDeadline; }
|
bool isUnlimited() const { return deadline == unlimitedDeadline; }
|
||||||
|
|
||||||
mozilla::TimeDuration toDuration() const {
|
|
||||||
MOZ_ASSERT(isTimeBudget());
|
|
||||||
return mozilla::TimeDuration::FromMilliseconds(timeBudget.budget);
|
|
||||||
}
|
|
||||||
|
|
||||||
int describe(char* buffer, size_t maxlen) const;
|
int describe(char* buffer, size_t maxlen) const;
|
||||||
|
|
||||||
static void Init();
|
static void Init();
|
||||||
|
|
|
@ -7886,16 +7886,6 @@ GCRuntime::gcCycle(bool nonincrementalByAPI, SliceBudget& budget,
|
||||||
|
|
||||||
if (shouldCollectNurseryForSlice(nonincrementalByAPI, budget)) {
|
if (shouldCollectNurseryForSlice(nonincrementalByAPI, budget)) {
|
||||||
minorGC(reason, gcstats::PhaseKind::EVICT_NURSERY_FOR_MAJOR_GC);
|
minorGC(reason, gcstats::PhaseKind::EVICT_NURSERY_FOR_MAJOR_GC);
|
||||||
if (!nonincrementalByAPI && budget.isTimeBudget()) {
|
|
||||||
// End this slice now if nursery collection took 4/5ths of our
|
|
||||||
// budget and there's 5ms or less left in the budget.
|
|
||||||
if ((nursery().lastDuration() / budget.toDuration()) > 0.8 &&
|
|
||||||
(budget.toDuration() - nursery().lastDuration() <=
|
|
||||||
mozilla::TimeDuration::FromMilliseconds(5)))
|
|
||||||
{
|
|
||||||
return IncrementalResult::Ok;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AutoGCSession session(rt, JS::HeapState::MajorCollecting);
|
AutoGCSession session(rt, JS::HeapState::MajorCollecting);
|
||||||
|
|
|
@ -581,13 +581,6 @@ class Nursery
|
||||||
void maybeClearProfileDurations();
|
void maybeClearProfileDurations();
|
||||||
void startProfile(ProfileKey key);
|
void startProfile(ProfileKey key);
|
||||||
void endProfile(ProfileKey key);
|
void endProfile(ProfileKey key);
|
||||||
public:
|
|
||||||
mozilla::TimeDuration lastDuration()
|
|
||||||
{
|
|
||||||
return profileDurations_[ProfileKey::Total];
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
static void printProfileDurations(const ProfileDurations& times);
|
static void printProfileDurations(const ProfileDurations& times);
|
||||||
|
|
||||||
friend class TenuringTracer;
|
friend class TenuringTracer;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче