|
 |
3cfb2b8 |
diff -up mozilla-release/toolkit/xre/nsAppRunner.cpp.old mozilla-release/toolkit/xre/nsAppRunner.cpp
|
|
|
3cfb2b8 |
--- mozilla-release/toolkit/xre/nsAppRunner.cpp.old 2014-11-26 03:17:40.000000000 +0100
|
|
|
3cfb2b8 |
+++ mozilla-release/toolkit/xre/nsAppRunner.cpp 2015-01-05 14:23:05.977933308 +0100
|
|
|
3cfb2b8 |
@@ -4168,10 +4168,8 @@ XREMain::XRE_main(int argc, char* argv[]
|
|
|
3cfb2b8 |
|
|
|
3cfb2b8 |
#if defined(MOZ_WIDGET_GTK)
|
|
|
3cfb2b8 |
#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
|
|
|
3cfb2b8 |
- // Disable the slice allocator, since jemalloc already uses similar layout
|
|
|
3cfb2b8 |
- // algorithms, and using a sub-allocator tends to increase fragmentation.
|
|
|
3cfb2b8 |
- // This must be done before g_thread_init() is called.
|
|
|
3cfb2b8 |
- g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
|
|
|
3cfb2b8 |
+ // rhbz#1014858 - enable slice allocator for child processes
|
|
|
3cfb2b8 |
+ unsetenv("G_SLICE");
|
|
|
3cfb2b8 |
#endif
|
|
|
3cfb2b8 |
g_thread_init(nullptr);
|
|
|
3cfb2b8 |
#endif
|