summaryrefslogtreecommitdiffstats
path: root/js/xpconnect/src/XPCJSContext.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-28 17:55:46 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-28 17:57:05 +0200
commitb53db93006f732fb2e140137e4713dedca1700d9 (patch)
treea2c1817c0fa6dd40d7da600148db70566e3a359d /js/xpconnect/src/XPCJSContext.cpp
parentdb4b6dc1dab3dd099c93253b96fbe8089c2f9e60 (diff)
parentf7b98c15a1c0a458b4bfa420f1743c8abfbdf7a8 (diff)
downloadUXP-b53db93006f732fb2e140137e4713dedca1700d9.tar
UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.gz
UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.lz
UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.xz
UXP-b53db93006f732fb2e140137e4713dedca1700d9.zip
Merge branch 'malloc-rewrite'
This resolves #263.
Diffstat (limited to 'js/xpconnect/src/XPCJSContext.cpp')
-rw-r--r--js/xpconnect/src/XPCJSContext.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index f5f6a11bb..8862bca32 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -59,10 +59,6 @@
#include "nsIXULRuntime.h"
#include "nsJSPrincipals.h"
-#if defined(MOZ_JEMALLOC4)
-#include "mozmemory.h"
-#endif
-
#ifdef XP_WIN
#include <windows.h>
#endif
@@ -147,18 +143,6 @@ 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<Telemetry::MEMORY_FREE_PURGED_PAGES_MS> timer;
- jemalloc_free_dirty_pages();
- }
-#endif
mActive = false;
}
return NS_OK;