diff options
| author | trav90 <travawine@protonmail.ch> | 2015-08-11 17:14:52 -0500 |
|---|---|---|
| committer | trav90 <travawine@protonmail.ch> | 2015-08-11 17:14:52 -0500 |
| commit | 6bc0cd359a230da1783bc5190adbad8acb42addf (patch) | |
| tree | e5d42fce39f7310f5d43317616f3bb28d97747fc /toolkit/xre/nsAppRunner.cpp | |
| parent | 036e63e18f6e71bed8ee77a46ff6a165816143a1 (diff) | |
| download | palemoon-gre-6bc0cd359a230da1783bc5190adbad8acb42addf.tar.gz | |
Revert "Replace g_slice_set_config with G_SLICE env var (Bug 833117)"
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 10053a190..f2473d92f 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3447,6 +3447,13 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) ScopedLogging log; #if defined(MOZ_WIDGET_GTK) +#if defined(MOZ_MEMORY) || defined(__FreeBSD__) \ + || defined(__NetBSD__) && __NetBSD_Version__ >= 500000000 + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. + g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1); +#endif g_thread_init(NULL); #endif |