corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1338518, make parent process to use 10ms gc slices when user is active, r=jonco

Browse Source
This commit is contained in:
Olli Pettay
2017-02-11 14:01:26 +02:00
parent c9e28379ff
commit a23f5a263e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dom/base/nsJSEnvironment.cpp
View File

@@ -111,7 +111,8 @@ const size_t gStackSize = 8192;
// Maximum amount of time that should elapse between incremental GC slices // Maximum amount of time that should elapse between incremental GC slices
#define NS_INTERSLICE_GC_DELAY 100 // ms #define NS_INTERSLICE_GC_DELAY 100 // ms
// If we haven't painted in 100ms, we allow for a longer GC budget // If we haven't painted in 100ms, or we're in e10s parent process and
// user isn't active, we allow for a longer GC budget.
#define NS_INTERSLICE_GC_BUDGET 40 // ms #define NS_INTERSLICE_GC_BUDGET 40 // ms
// The amount of time we wait between a request to CC (after GC ran) // The amount of time we wait between a request to CC (after GC ran)
@@ -188,7 +189,8 @@ static bool sNeedsFullGC = false;
static bool sNeedsGCAfterCC = false; static bool sNeedsGCAfterCC = false;
static bool sIncrementalCC = false; static bool sIncrementalCC = false;
static bool sDidPaintAfterPreviousICCSlice = false; static bool sDidPaintAfterPreviousICCSlice = false;
static bool sUserActive = false;
static int32_t sActiveIntersliceGCBudget = 0; // ms;
static nsScriptNameSpaceManager *gNameSpaceManager; static nsScriptNameSpaceManager *gNameSpaceManager;
static PRTime sFirstCollectionTime; static PRTime sFirstCollectionTime;
@@ -348,10 +350,12 @@ nsJSEnvironmentObserver::Observe(nsISupports* aSubject, const char* aTopic,
} }
} }
} else if (!nsCRT::strcmp(aTopic, "user-interaction-inactive")) { } else if (!nsCRT::strcmp(aTopic, "user-interaction-inactive")) {
sUserActive = false;
if (sCompactOnUserInactive) { if (sCompactOnUserInactive) {
nsJSContext::PokeShrinkingGC(); nsJSContext::PokeShrinkingGC();
} }
} else if (!nsCRT::strcmp(aTopic, "user-interaction-active")) { } else if (!nsCRT::strcmp(aTopic, "user-interaction-active")) {
sUserActive = true;
nsJSContext::KillShrinkingGCTimer(); nsJSContext::KillShrinkingGCTimer();
if (sIsCompactingOnUserInactive) { if (sIsCompactingOnUserInactive) {
JS::AbortIncrementalGC(sContext); JS::AbortIncrementalGC(sContext);
@@ -1726,10 +1730,13 @@ void
InterSliceGCTimerFired(nsITimer *aTimer, void *aClosure) InterSliceGCTimerFired(nsITimer *aTimer, void *aClosure)
{ {
nsJSContext::KillInterSliceGCTimer(); nsJSContext::KillInterSliceGCTimer();
bool e10sParent = XRE_IsParentProcess() && BrowserTabsRemoteAutostart();
int64_t budget = e10sParent && sUserActive && sActiveIntersliceGCBudget ?
sActiveIntersliceGCBudget : NS_INTERSLICE_GC_BUDGET;
nsJSContext::GarbageCollectNow(JS::gcreason::INTER_SLICE_GC, nsJSContext::GarbageCollectNow(JS::gcreason::INTER_SLICE_GC,
nsJSContext::IncrementalGC, nsJSContext::IncrementalGC,
nsJSContext::NonShrinkingGC, nsJSContext::NonShrinkingGC,
NS_INTERSLICE_GC_BUDGET); budget);
} }
// static // static
@@ -2320,6 +2327,7 @@ SetMemoryGCSliceTimePrefChangedCallback(const char* aPrefName, void* aClosure)
int32_t pref = Preferences::GetInt(aPrefName, -1); int32_t pref = Preferences::GetInt(aPrefName, -1);
// handle overflow and negative pref values // handle overflow and negative pref values
if (pref > 0 && pref < 100000) if (pref > 0 && pref < 100000)
sActiveIntersliceGCBudget = pref;
JS_SetGCParameter(sContext, JSGC_SLICE_TIME_BUDGET, pref); JS_SetGCParameter(sContext, JSGC_SLICE_TIME_BUDGET, pref);
} }