diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-25 14:31:58 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-25 14:34:58 +0000 |
| commit | 5862a42ac007cb6a8778d511a074f421a88dd993 (patch) | |
| tree | 0c342d0cac7c7dfb2a5ba2ccd8ad97f8b1a21794 /main/xulrunner/mallctl.patch | |
| parent | 986f52de429afaf6b1dca4b476c7b9038bccffc7 (diff) | |
| download | aports-5862a42ac007cb6a8778d511a074f421a88dd993.tar.bz2 aports-5862a42ac007cb6a8778d511a074f421a88dd993.tar.xz | |
main/xulrunner: upgrade to 18.0.1
Diffstat (limited to 'main/xulrunner/mallctl.patch')
| -rw-r--r-- | main/xulrunner/mallctl.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/main/xulrunner/mallctl.patch b/main/xulrunner/mallctl.patch new file mode 100644 index 0000000000..7c56f584e6 --- /dev/null +++ b/main/xulrunner/mallctl.patch @@ -0,0 +1,28 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=815681 + +diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp +index 69af67d..ef98fec 100644 +--- a/xpcom/base/AvailableMemoryTracker.cpp ++++ b/xpcom/base/AvailableMemoryTracker.cpp +@@ -26,9 +26,7 @@ + # include <windows.h> + #endif + +-#if defined(MOZ_MEMORY) + # include "jemalloc.h" +-#endif // MOZ_MEMORY + + using namespace mozilla; + +@@ -498,11 +496,7 @@ nsJemallocFreeDirtyPagesRunnable::Run() + { + MOZ_ASSERT(NS_IsMainThread()); + +-#if defined(MOZ_JEMALLOC) +- mallctl("arenas.purge", nullptr, 0, nullptr, 0); +-#elif defined(MOZ_MEMORY) + jemalloc_free_dirty_pages(); +-#endif + + return NS_OK; + } |