diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index f9200fec298..be609e748f2 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -976,7 +976,7 @@ public: } void - DispatchDeferredDeletion(bool aContinuation) override + DispatchDeferredDeletion(bool aContinuation, bool aPurge) override { MOZ_ASSERT(!aContinuation); diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp index 1c585861b13..740bf09c6aa 100644 --- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -57,6 +57,10 @@ #include "nsExceptionHandler.h" #endif +#if defined(MOZ_JEMALLOC4) +#include "mozmemory.h" +#endif + using namespace mozilla; using namespace xpc; using namespace JS; @@ -146,26 +150,40 @@ public: mActive = false; } } else { +#if defined(MOZ_JEMALLOC4) + if (mPurge) { + /* Jemalloc purges dirty pages regularly during free() when the + * ratio of dirty pages compared to active pages is higher than + * 1 << lg_dirty_mult. A high ratio can have an impact on + * performance, so we use the default ratio of 8, but force a + * regular purge of all remaining dirty pages, after cycle + * collection. */ + Telemetry::AutoTimer timer; + jemalloc_free_dirty_pages(); + } +#endif mActive = false; } return NS_OK; } - void Dispatch(bool aContinuation = false) + void Dispatch(bool aContinuation = false, bool aPurge = false) { if (mContinuation) { mContinuation = aContinuation; } + mPurge = aPurge; if (!mActive && NS_SUCCEEDED(NS_DispatchToCurrentThread(this))) { mActive = true; } } - AsyncFreeSnowWhite() : mContinuation(false), mActive(false) {} + AsyncFreeSnowWhite() : mContinuation(false), mActive(false), mPurge(false) {} public: bool mContinuation; bool mActive; + bool mPurge; }; namespace xpc { @@ -630,9 +648,9 @@ XPCJSRuntime::EndCycleCollectionCallback(CycleCollectorResults& aResults) } void -XPCJSRuntime::DispatchDeferredDeletion(bool aContinuation) +XPCJSRuntime::DispatchDeferredDeletion(bool aContinuation, bool aPurge) { - mAsyncSnowWhiteFreer->Dispatch(aContinuation); + mAsyncSnowWhiteFreer->Dispatch(aContinuation, aPurge); } void diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index 43d50f122ad..5febaf8c139 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -554,7 +554,7 @@ public: void PrepareForForgetSkippable() override; void BeginCycleCollectionCallback() override; void EndCycleCollectionCallback(mozilla::CycleCollectorResults& aResults) override; - void DispatchDeferredDeletion(bool continuation) override; + void DispatchDeferredDeletion(bool aContinuation, bool aPurge = false) override; void CustomGCCallback(JSGCStatus status) override; void CustomOutOfMemoryCallback() override; diff --git a/memory/build/jemalloc_config.cpp b/memory/build/jemalloc_config.cpp index 96a6e73aa4a..1a83c79e20c 100644 --- a/memory/build/jemalloc_config.cpp +++ b/memory/build/jemalloc_config.cpp @@ -22,15 +22,6 @@ #endif /* Override some jemalloc defaults */ -#ifdef MOZ_WIDGET_GONK -/* we tolerate around 4MiB of dirty pages on most platforms, except for B2G, - * where our limit is 1MiB - */ -#define MOZ_MALLOC_PLATFORM_OPTIONS ",lg_dirty_mult:8" -#else -#define MOZ_MALLOC_PLATFORM_OPTIONS ",lg_dirty_mult:6" -#endif - #ifdef DEBUG #define MOZ_MALLOC_BUILD_OPTIONS ",junk:true" #else @@ -39,7 +30,7 @@ #define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false" MFBT_DATA const char* je_(malloc_conf) = - MOZ_MALLOC_OPTIONS MOZ_MALLOC_PLATFORM_OPTIONS MOZ_MALLOC_BUILD_OPTIONS; + MOZ_MALLOC_OPTIONS MOZ_MALLOC_BUILD_OPTIONS; #ifdef ANDROID #include diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 4d37632515c..60b67a21107 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -575,8 +575,7 @@ "high": "1024", "n_buckets": 10, "extended_statistics_ok": true, - "description": "Time(ms) to purge MADV_FREE'd heap pages.", - "cpp_guard": "XP_MACOSX" + "description": "Time(ms) to purge dirty heap pages." }, "LOW_MEMORY_EVENTS_VIRTUAL": { "alert_emails": ["memshrink-telemetry-alerts@mozilla.com"], diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h index d48ae4e8b5e..6c7fbb68643 100644 --- a/xpcom/base/CycleCollectedJSRuntime.h +++ b/xpcom/base/CycleCollectedJSRuntime.h @@ -290,7 +290,7 @@ public: virtual void PrepareForForgetSkippable() = 0; virtual void BeginCycleCollectionCallback() = 0; virtual void EndCycleCollectionCallback(CycleCollectorResults& aResults) = 0; - virtual void DispatchDeferredDeletion(bool aContinuation) = 0; + virtual void DispatchDeferredDeletion(bool aContinuation, bool aPurge = false) = 0; JSRuntime* Runtime() const { diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index 389f53db077..331030b269a 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -3296,7 +3296,7 @@ nsCycleCollector::CollectWhite() } timeLog.Checkpoint("CollectWhite::Unroot"); - nsCycleCollector_dispatchDeferredDeletion(false); + nsCycleCollector_dispatchDeferredDeletion(false, true); timeLog.Checkpoint("CollectWhite::dispatchDeferredDeletion"); mIncrementalPhase = CleanupPhase; @@ -4057,11 +4057,11 @@ nsCycleCollector_forgetSkippable(bool aRemoveChildlessNodes, } void -nsCycleCollector_dispatchDeferredDeletion(bool aContinuation) +nsCycleCollector_dispatchDeferredDeletion(bool aContinuation, bool aPurge) { CycleCollectedJSRuntime* rt = CycleCollectedJSRuntime::Get(); if (rt) { - rt->DispatchDeferredDeletion(aContinuation); + rt->DispatchDeferredDeletion(aContinuation, aPurge); } } diff --git a/xpcom/base/nsCycleCollector.h b/xpcom/base/nsCycleCollector.h index fadd57bec1f..3988702e48d 100644 --- a/xpcom/base/nsCycleCollector.h +++ b/xpcom/base/nsCycleCollector.h @@ -39,7 +39,8 @@ void nsCycleCollector_prepareForGarbageCollection(); // If an incremental cycle collection is in progress, finish it. void nsCycleCollector_finishAnyCurrentCollection(); -void nsCycleCollector_dispatchDeferredDeletion(bool aContinuation = false); +void nsCycleCollector_dispatchDeferredDeletion(bool aContinuation = false, + bool aPurge = false); bool nsCycleCollector_doDeferredDeletion(); already_AddRefed nsCycleCollector_createLogSink(); diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp index 63205dfc24f..4deb7883969 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -457,10 +457,12 @@ static nsresult ResidentDistinguishedAmountHelper(int64_t* aN, bool aDoPurge) { #ifdef HAVE_JEMALLOC_STATS +#ifndef MOZ_JEMALLOC4 if (aDoPurge) { Telemetry::AutoTimer timer; jemalloc_purge_freed_pages(); } +#endif #endif task_basic_info ti;