Bug 1026828 - Restore MOZ_STORAGE_MEMORY for system jemalloc after bug 938730. r=glandium
authorJan Beich <jbeich@tormail.org>
Tue, 17 Jun 2014 17:55:00 +0200
changeset 189284 d06ae272ade38c89748f0302049565ea93a9ab58
parent 189283 6a2f8dead92bd79fcb8ccccb53f012b399720585
child 189311 df6fbd43f0b832907dfacf378a4f839d84738a49
push id45034
push usercbook@mozilla.com
push dateWed, 18 Jun 2014 11:36:18 +0000
treeherdermozilla-inbound@d06ae272ade3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1026828, 938730
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1026828 - Restore MOZ_STORAGE_MEMORY for system jemalloc after bug 938730. r=glandium
storage/src/moz.build
--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -45,21 +45,24 @@ FINAL_LIBRARY = 'storagecomps'
 
 # Don't use the jemalloc allocator on Android, because we can't guarantee
 # that Gecko will configure sqlite before it is first used (bug 730495).
 #
 # Don't use the jemalloc allocator when using system sqlite. Linked in libraries
 # (such as NSS) might trigger an initialization of sqlite and allocation
 # of memory using the default allocator, prior to the storage service
 # registering its allocator, causing memory management failures (bug 938730).
+# However, this is not an issue if both the jemalloc allocator and the default
+# allocator are the same thing.
 #
 # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
 # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
 # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
+if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
+                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
     if CONFIG['OS_TARGET'] != 'Android':
         DEFINES['MOZ_STORAGE_MEMORY'] = True
 
 # This is the default value.  If we ever change it when compiling sqlite, we
 # will need to change it here as well.
 DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
 
 LOCAL_INCLUDES += [