Date: Sun, 17 Jun 2012 14:42:13 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r765 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206171442.q5HEgDii071891@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jun 17 14:42:13 2012 New Revision: 765 Log: Disable glib slice allocator with system jemalloc, too. jemalloc replaced phkmalloc since FreeBSD 7.0-RELEASE. see also bug#431221 Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n + QApplication app(gArgc, gArgv); + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3824,7 +3824,7 @@ XREMain::XRE_main(int argc, char* argv[] + ScopedLogging log; + + #if defined(MOZ_WIDGET_GTK) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n + QApplication app(gArgc, gArgv); + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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. Added: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206171442.q5HEgDii071891>