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 624549, don't always do a global gc before cc, r=gal, a=approved

Browse Source 
--HG--
extra : rebase_source : 99fe0d8e28d339ca9680d048e20356eb10f8a29d
This commit is contained in:
Olli Pettay 2011-01-12 22:44:41 +02:00
parent cc238f48d5
commit 594bbccb52
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/base/nsDOMWindowUtils.cpp
View File

@ -655,6 +655,9 @@ nsDOMWindowUtils::GarbageCollect(nsICycleCollectorListener *aListener)
}
#endif
if (nsContentUtils::XPConnect()) {
nsContentUtils::XPConnect()->GarbageCollect();
}
nsJSContext::CC(aListener);
return NS_OK;

42
dom/base/nsJSEnvironment.cpp
View File

@ -169,14 +169,16 @@ static PRLogModuleInfo* gJSDiagnostics;
#define NS_MIN_CC_INTERVAL 10000 // ms
// If previous cycle collection collected more than this number of objects,
// the next collection will happen somewhat soon.
// Also, if there are more than this number suspected objects, GC will be called
// right before CC, if it wasn't called after last CC.
#define NS_COLLECTED_OBJECTS_LIMIT 5000
// CC will be called if GC has been called at least this number of times and
// there are at least NS_MIN_SUSPECT_CHANGES new suspected objects.
#define NS_MAX_GC_COUNT 5
#define NS_MIN_SUSPECT_CHANGES 10
#define NS_MIN_SUSPECT_CHANGES 100
// CC will be called if there are at least NS_MAX_SUSPECT_CHANGES new suspected
// objects.
#define NS_MAX_SUSPECT_CHANGES 100
#define NS_MAX_SUSPECT_CHANGES 1000
// if you add statics here, add them to the list in nsJSRuntime::Startup
@ -271,7 +273,7 @@ nsUserActivityObserver::Observe(nsISupports* aSubject, const char* aTopic,
if (sUserIsActive) {
sUserIsActive = PR_FALSE;
if (!sGCTimer) {
nsJSContext::IntervalCC();
nsJSContext::MaybeCC(PR_FALSE);
return NS_OK;
}
}
@ -3610,6 +3612,21 @@ nsJSContext::ScriptExecuted()
return NS_OK;
}
static inline uint32
GetGCRunsSinceLastCC()
{
// To avoid crash if nsJSRuntime is not properly initialized.
// See the bug 474586
if (!nsJSRuntime::sRuntime)
return 0;
// Since JS_GetGCParameter() and sSavedGCCount are unsigned, the following
// gives the correct result even when the GC counter wraps around
// UINT32_MAX since the last call to JS_GetGCParameter().
return JS_GetGCParameter(nsJSRuntime::sRuntime, JSGC_NUMBER) -
sSavedGCCount;
}
//static
void
nsJSContext::CC(nsICycleCollectorListener *aListener)
@ -3626,7 +3643,9 @@ nsJSContext::CC(nsICycleCollectorListener *aListener)
sCCSuspectChanges = 0;
// nsCycleCollector_collect() no longer forces a JS garbage collection,
// so we have to do it ourselves here.
if (nsContentUtils::XPConnect()) {
if (nsContentUtils::XPConnect() &&
!GetGCRunsSinceLastCC() &&
sCCSuspectedCount > NS_COLLECTED_OBJECTS_LIMIT) {
nsContentUtils::XPConnect()->GarbageCollect();
}
sCollectedObjectsCounts = nsCycleCollector_collect(aListener);
@ -3641,21 +3660,6 @@ nsJSContext::CC(nsICycleCollectorListener *aListener)
#endif
}
static inline uint32
GetGCRunsSinceLastCC()
{
// To avoid crash if nsJSRuntime is not properly initialized.
// See the bug 474586
if (!nsJSRuntime::sRuntime)
return 0;
// Since JS_GetGCParameter() and sSavedGCCount are unsigned, the following
// gives the correct result even when the GC counter wraps around
// UINT32_MAX since the last call to JS_GetGCParameter().
return JS_GetGCParameter(nsJSRuntime::sRuntime, JSGC_NUMBER) -
sSavedGCCount;
}
//static
PRBool
nsJSContext::MaybeCC(PRBool aHigherProbability)