[SVN-Commit] r764 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sun Jun 17 07:30:17 UTC 2012


Author: jbeich
Date: Sun Jun 17 07:30:05 2012
New Revision: 764

Log:
reduce red paint in about:memory, it's gotten worse in Nightly

Added:
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
   branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
   branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
   branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp

Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- mozilla/memory/mozalloc/mozalloc.cpp~
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.

Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- mozilla/memory/mozalloc/mozalloc.cpp~
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY)
++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
+     return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+     return _msize(ptr);

Added: branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- mozilla/memory/mozalloc/mozalloc.cpp~
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.

Added: branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- memory/mozalloc/mozalloc.cpp~
++++ memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.

Added: branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- memory/mozalloc/mozalloc.cpp~
++++ memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY)
++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
+     return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+     return _msize(ptr);

Added: branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- memory/mozalloc/mozalloc.cpp~
++++ memory/mozalloc/mozalloc.cpp
+@@ -19,6 +19,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ #  define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+     // Android bionic libc doesn't have malloc_usable_size.
+     return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)

Added: branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- memory/mozalloc/mozalloc.cpp~
++++ memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.

Added: branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- memory/mozalloc/mozalloc.cpp~
++++ memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY)
++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
+     return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+     return _msize(ptr);

Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- mozilla/memory/mozalloc/mozalloc.cpp~
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.

Added: branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp	Sun Jun 17 07:30:05 2012	(r764)
@@ -0,0 +1,21 @@
+--- mozilla/memory/mozalloc/mozalloc.cpp~
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -52,6 +52,9 @@
+ #if defined(XP_UNIX)
+ #  include <unistd.h>           // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
++#ifdef __FreeBSD__
++#  include <malloc_np.h>        // for malloc_usable_size
++#endif
+ 
+ #if defined(MOZ_MEMORY)
+ // jemalloc.h doesn't redeclare symbols if they're provided by the OS
+@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
+     // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
+     // might use a libc that doesn't have malloc_usable_size.  Let's fix this
+     // if/when it happens.


More information about the freebsd-gecko mailing list