[SVN-Commit] r766 - in branches/experimental: Mk www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jun 18 13:42:27 2012
New Revision: 766

Log:
better sqlite memory reporting

Added:
   branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp
Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Sun Jun 17 14:42:13 2012	(r765)
+++ branches/experimental/Mk/bsd.gecko.mk	Mon Jun 18 13:42:27 2012	(r766)
@@ -784,6 +784,7 @@
 .for subdir in "" nsprpub js/src
 	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
 		${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+		${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 		${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 		${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 	fi

Added: branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp	Mon Jun 18 13:42:27 2012	(r766)
@@ -0,0 +1,38 @@
+--- storage/src/mozStorageService.cpp~
++++ storage/src/mozStorageService.cpp
+@@ -36,6 +36,25 @@
+ #include "mozilla/FunctionTimer.h"
+ #include "mozilla/Util.h"
+ 
++#if !defined(MOZ_MEMORY) && defined(__FreeBSD__)
++#include <malloc_np.h>
++#include <osreldate.h>
++
++#define MOZ_STORAGE_MEMORY
++
++static inline size_t
++je_malloc_usable_size_in_advance(size_t size) {
++#if __FreeBSD_version > 1000011
++  size_t ret;
++  if (size == 0)
++    size = 1;
++  if (!nallocm(&ret, size, 0))
++    return ret;
++#endif
++  return size;
++}
++#endif
++
+ namespace {
+ 
+ class QuotaCallbackData
+@@ -497,7 +516,9 @@ Service::shutdown()
+ sqlite3_vfs *ConstructTelemetryVFS();
+ 
+ #ifdef MOZ_STORAGE_MEMORY
++#ifdef MOZ_MEMORY
+ #  include "jemalloc.h"
++#endif
+ 
+ namespace {
+