Bug 1363992 - Remove support for system jemalloc. r=njn

--HG-- extra : rebase_source : 9141402b6f9e84c67afc14303633d328eb5b652c
2024-12-03 18:47:53 +00:00 · 2017-05-11 13:03:20 +09:00 · 2017-05-11 13:03:20 +09:00 · 1a9d4c6f33
commit 1a9d4c6f33
parent 6e5a87871a
10 changed files with 32 additions and 64 deletions
--- a/build/autoconf/jemalloc.m4
+++ b/build/autoconf/jemalloc.m4
@ -8,7 +8,7 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then

  # Run jemalloc configure script

-  if test -z "$MOZ_SYSTEM_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC4" -o -n "$MOZ_REPLACE_MALLOC"; then
+  if test "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC4" -o -n "$MOZ_REPLACE_MALLOC"; then
    ac_configure_args="--build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_ --disable-valgrind"
    if test -n "$MOZ_DEBUG"; then
      ac_configure_args="$ac_configure_args --enable-debug"
--- a/memory/build/jemalloc_config.cpp
+++ b/memory/build/jemalloc_config.cpp
@ -11,12 +11,8 @@
 #include <mozilla/Assertions.h>
 #include "mozilla/Types.h"

-#if defined(MOZ_SYSTEM_JEMALLOC)
-#include MALLOC_H
-#else
 #define DLLEXPORT
 #include "jemalloc/jemalloc.h"
-#endif

 #ifdef XP_WIN
 #include <windows.h>
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@ -51,8 +51,7 @@ if CONFIG['MOZ_GLUE_IN_PROGRAM']:
    DIST_INSTALL = True

 # Keep jemalloc separated when mozglue is statically linked
-if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
-                             CONFIG['MOZ_SYSTEM_JEMALLOC']):
+if CONFIG['MOZ_MEMORY'] and CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
    FINAL_LIBRARY = 'mozglue'

 if CONFIG['MOZ_REPLACE_MALLOC'] and CONFIG['OS_TARGET'] == 'Darwin':
--- a/memory/build/mozjemalloc_compat.c
+++ b/memory/build/mozjemalloc_compat.c
@ -14,11 +14,7 @@

 #include <stdbool.h>

-#if defined(MOZ_SYSTEM_JEMALLOC)
-#  include MALLOC_H
-#else
-#  include "jemalloc/jemalloc.h"
-#endif
+#include "jemalloc/jemalloc.h"

 /*
 *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@ -126,43 +126,38 @@

 #include "mozilla/Types.h"

-#if !defined(MOZ_SYSTEM_JEMALLOC)
-#  ifdef MOZ_MEMORY_IMPL
-#    if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC)
-#      define mozmem_malloc_impl(a)     je_ ## a
-#      define mozmem_jemalloc_impl(a)   je_ ## a
-#    else
-#      define MOZ_JEMALLOC_API MFBT_API
-#      ifdef MOZ_REPLACE_JEMALLOC
-#        define MOZ_MEMORY_API MFBT_API
-#        define mozmem_malloc_impl(a)     replace_ ## a
-#        define mozmem_jemalloc_impl(a)   replace_ ## a
-#      elif (defined(XP_WIN) || defined(XP_DARWIN))
-#        if defined(MOZ_REPLACE_MALLOC)
-#          define mozmem_malloc_impl(a)   a ## _impl
-#        else
-#          define mozmem_malloc_impl(a)   je_ ## a
-#        endif
+#ifdef MOZ_MEMORY_IMPL
+#  if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC)
+#    define mozmem_malloc_impl(a)     je_ ## a
+#    define mozmem_jemalloc_impl(a)   je_ ## a
+#  else
+#    define MOZ_JEMALLOC_API MFBT_API
+#    ifdef MOZ_REPLACE_JEMALLOC
+#      define MOZ_MEMORY_API MFBT_API
+#      define mozmem_malloc_impl(a)     replace_ ## a
+#      define mozmem_jemalloc_impl(a)   replace_ ## a
+#    elif (defined(XP_WIN) || defined(XP_DARWIN))
+#      if defined(MOZ_REPLACE_MALLOC)
+#        define mozmem_malloc_impl(a)   a ## _impl
 #      else
-#        define MOZ_MEMORY_API MFBT_API
-#        if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
-#          define MOZ_WRAP_NEW_DELETE
-#        endif
+#        define mozmem_malloc_impl(a)   je_ ## a
+#      endif
+#    else
+#      define MOZ_MEMORY_API MFBT_API
+#      if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
+#        define MOZ_WRAP_NEW_DELETE
 #      endif
 #    endif
-#    ifdef XP_WIN
-#      define mozmem_dup_impl(a)      wrap_ ## a
-#    endif
 #  endif
-
-/* All other jemalloc3 functions are prefixed with "je_", except when
- * building against an unprefixed system jemalloc library */
-#  define je_(a) je_ ## a
-#else /* defined(MOZ_SYSTEM_JEMALLOC) */
-#  define je_(a) a
+#  ifdef XP_WIN
+#    define mozmem_dup_impl(a)      wrap_ ## a
+#  endif
 #endif

-#if !defined(MOZ_MEMORY_IMPL) || defined(MOZ_SYSTEM_JEMALLOC)
+/* All other jemalloc3 functions are prefixed with "je_" */
+#define je_(a) je_ ## a
+
+#if !defined(MOZ_MEMORY_IMPL)
 #  define MOZ_MEMORY_API MFBT_API
 #  define MOZ_JEMALLOC_API MFBT_API
 #endif
--- a/memory/build/replace_malloc.c
+++ b/memory/build/replace_malloc.c
@ -10,10 +10,6 @@
 #  error Should not compile this file when replace-malloc is disabled
 #endif

-#ifdef MOZ_SYSTEM_JEMALLOC
-#  error Should not compile this file when we want to use native jemalloc
-#endif
-
 #include "mozmemory_wrap.h"

 /* Declare all je_* functions */
--- a/memory/moz.build
+++ b/memory/moz.build
@ -24,8 +24,7 @@ if CONFIG['MOZ_MEMORY']:
    ]

    if CONFIG['MOZ_JEMALLOC4'] or CONFIG['MOZ_REPLACE_MALLOC']:
-        if not CONFIG['MOZ_SYSTEM_JEMALLOC']:
-            DIRS += ['jemalloc']
+        DIRS += ['jemalloc']

    if CONFIG['MOZ_REPLACE_MALLOC']:
        DIRS += ['replace']
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@ -30,7 +30,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':

 if not CONFIG['JS_STANDALONE']:

-    if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_SYSTEM_JEMALLOC'] or FORCE_SHARED_LIB):
+    if CONFIG['MOZ_MEMORY'] and FORCE_SHARED_LIB:
        pass
        # TODO: SHARED_LIBRARY_LIBS go here
    else:
--- a/old-configure.in
+++ b/old-configure.in
@ -4066,8 +4066,6 @@ Android|WINNT|Darwin)
 esac

 if test -n "$MOZ_REPLACE_MALLOC"; then
-    MOZ_SYSTEM_JEMALLOC=
-
    dnl Replace-malloc Mac linkage quirks
    if test -n "$MACOSX_DEPLOYMENT_TARGET"; then
        AC_CACHE_CHECK([how to do weak dynamic linking],
@ -4134,15 +4132,6 @@ if test -z "$MOZ_MEMORY"; then
      ;;
  esac
 else
-  if test -n "$MOZ_JEMALLOC4" -a -z "$MOZ_REPLACE_MALLOC"; then
-    MOZ_SYSTEM_JEMALLOC=1
-    AC_CHECK_FUNCS(mallctl nallocx,,
-      [MOZ_SYSTEM_JEMALLOC=
-       break])
-    if test -n "$MOZ_SYSTEM_JEMALLOC"; then
-      AC_DEFINE(MOZ_SYSTEM_JEMALLOC)
-    fi
-  fi
  if test "x$MOZ_DEBUG" = "x1"; then
    AC_DEFINE(MOZ_MEMORY_DEBUG)
  fi
@ -4155,7 +4144,6 @@ else
    ;;
  esac
 fi # MOZ_MEMORY
-AC_SUBST(MOZ_SYSTEM_JEMALLOC)
 AC_SUBST(MOZ_GLUE_IN_PROGRAM)

 # Allow the application to provide a subconfigure script.
--- a/storage/moz.build
+++ b/storage/moz.build
@ -101,8 +101,7 @@ FINAL_LIBRARY = 'xul'
 # 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_SYSTEM_SQLITE']
-                             or CONFIG['MOZ_SYSTEM_JEMALLOC']):
+if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']:
    if CONFIG['OS_TARGET'] != 'Android':
        DEFINES['MOZ_STORAGE_MEMORY'] = True