Bug 1201792 - s/MOZ_JEMALLOC3/MOZ_JEMALLOC4/. r=njn

2015-09-04 14:45:53 +09:00 · 2015-09-04 14:45:53 +09:00 · 0efccdc82c
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@ -112,8 +112,8 @@ endif
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif
-ifdef MOZ_JEMALLOC3
-DEFINES += -DMOZ_JEMALLOC3
+ifdef MOZ_JEMALLOC4
+DEFINES += -DMOZ_JEMALLOC4
 endif
 DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)

--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@ -116,7 +116,7 @@
@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
 #ifdef MOZ_REPLACE_MALLOC
-#ifndef MOZ_JEMALLOC3
+#ifndef MOZ_JEMALLOC4
@BINPATH@/@DLL_PREFIX@replace_jemalloc@DLL_SUFFIX@
 #endif
 #endif
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@ -141,8 +141,8 @@ endif
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif
-ifdef MOZ_JEMALLOC3
-DEFINES += -DMOZ_JEMALLOC3
+ifdef MOZ_JEMALLOC4
+DEFINES += -DMOZ_JEMALLOC4
 endif
 DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
 ifdef CLANG_CXX
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@ -124,7 +124,7 @@
 #endif
 #endif
 #ifdef MOZ_REPLACE_MALLOC
-#ifndef MOZ_JEMALLOC3
+#ifndef MOZ_JEMALLOC4
@BINPATH@/@DLL_PREFIX@replace_jemalloc@DLL_SUFFIX@
 #endif
 #endif
--- a/configure.in
+++ b/configure.in
@ -7223,7 +7223,7 @@ dnl ========================================================
 dnl = Jemalloc build setup
 dnl ========================================================
 if test -z "$MOZ_MEMORY"; then
-  if test -n "$MOZ_JEMALLOC3" -a -z "$MOZ_REPLACE_MALLOC"; then
+  if test -n "$MOZ_JEMALLOC4" -a -z "$MOZ_REPLACE_MALLOC"; then
    MOZ_NATIVE_JEMALLOC=1
    AC_CHECK_FUNCS(mallctl nallocx,,
      [MOZ_NATIVE_JEMALLOC=
@ -7231,7 +7231,7 @@ if test -z "$MOZ_MEMORY"; then
    if test -n "$MOZ_NATIVE_JEMALLOC"; then
      MOZ_MEMORY=1
      AC_DEFINE(MOZ_MEMORY)
-      AC_DEFINE(MOZ_JEMALLOC3)
+      AC_DEFINE(MOZ_JEMALLOC4)
      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
    fi
  fi
@ -7244,8 +7244,8 @@ if test -z "$MOZ_MEMORY"; then
  esac
 else
  AC_DEFINE(MOZ_MEMORY)
-  if test -n "$MOZ_JEMALLOC3"; then
-    AC_DEFINE(MOZ_JEMALLOC3)
+  if test -n "$MOZ_JEMALLOC4"; then
+    AC_DEFINE(MOZ_JEMALLOC4)
  fi
  if test "x$MOZ_DEBUG" = "x1"; then
    AC_DEFINE(MOZ_MEMORY_DEBUG)
@ -7294,7 +7294,7 @@ else
  esac
 fi # MOZ_MEMORY
 AC_SUBST(MOZ_MEMORY)
-AC_SUBST(MOZ_JEMALLOC3)
+AC_SUBST(MOZ_JEMALLOC4)
 AC_SUBST(MOZ_NATIVE_JEMALLOC)
 AC_SUBST(MOZ_CRT)
 export MOZ_CRT
@ -9131,7 +9131,7 @@ fi

 # Run jemalloc configure script

-if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC3" -o -n "$MOZ_REPLACE_MALLOC"; then
+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$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"
  # We're using memalign for _aligned_malloc in memory/build/mozmemory_wrap.c
  # on Windows, so just export memalign on all platforms.
@ -9145,7 +9145,7 @@ if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC3" -
      ac_configure_args="$ac_configure_args --enable-ivsalloc"
    fi
  fi
-  if test -n "$MOZ_JEMALLOC3"; then
+  if test -n "$MOZ_JEMALLOC4"; then
    case "${OS_ARCH}" in
      WINNT|Darwin)
        # We want jemalloc functions to be kept hidden on both Mac and Windows
@ -9171,7 +9171,7 @@ if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC3" -
        MANGLE=$_MANGLE
        ;;
    esac
-  elif test -z "$MOZ_JEMALLOC3"; then
+  elif test -z "$MOZ_JEMALLOC4"; then
    MANGLE=$_MANGLE
    JEMALLOC_WRAPPER=replace_
  fi
--- a/memory/build/jemalloc_config.cpp
+++ b/memory/build/jemalloc_config.cpp
@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

-#ifdef MOZ_JEMALLOC3
+#ifdef MOZ_JEMALLOC4

 #define MOZ_JEMALLOC_IMPL

@ -161,7 +161,7 @@ JemallocInit gJemallocInit;

 #else
 #include <mozilla/Assertions.h>
-#endif /* MOZ_JEMALLOC3 */
+#endif /* MOZ_JEMALLOC4 */

 /* Provide an abort function for use in jemalloc code */
 extern "C" void moz_abort() {
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@ -23,7 +23,7 @@ SOURCES += [
    'mozmemory_wrap.c',
 ]

-if CONFIG['MOZ_JEMALLOC3']:
+if CONFIG['MOZ_JEMALLOC4']:
    SOURCES += [
        'mozjemalloc_compat.c',
    ]
@ -40,7 +40,7 @@ if CONFIG['MOZ_REPLACE_MALLOC']:

 Library('memory')

-if CONFIG['MOZ_JEMALLOC3']:
+if CONFIG['MOZ_JEMALLOC4']:
    if not CONFIG['MOZ_NATIVE_JEMALLOC']:
        USE_LIBS += [
            'jemalloc',
--- a/memory/build/mozjemalloc_compat.c
+++ b/memory/build/mozjemalloc_compat.c
@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

-#ifndef MOZ_JEMALLOC3
+#ifndef MOZ_JEMALLOC4
 #  error Should only compile this file when building with jemalloc 3
 #endif

--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@ -61,7 +61,7 @@ if CONFIG['OS_TARGET'] == 'Linux':
    # For mremap
    DEFINES['_GNU_SOURCE'] = True

-if CONFIG['MOZ_NUWA_PROCESS'] and CONFIG['MOZ_JEMALLOC3']:
+if CONFIG['MOZ_NUWA_PROCESS'] and CONFIG['MOZ_JEMALLOC4']:
    DEFINES['pthread_mutex_lock'] = '__real_pthread_mutex_lock'

 if CONFIG['GNU_CC']:
--- a/memory/moz.build
+++ b/memory/moz.build
@ -18,7 +18,7 @@ if CONFIG['MOZ_MEMORY']:
        'mozjemalloc',
    ]

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

--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-ifndef MOZ_JEMALLOC3
+ifndef MOZ_JEMALLOC4
 # Force optimize mozjemalloc on --disable-optimize builds.
 # This works around the issue that the Android NDK's definition of ffs is
 # broken when compiling without optimization, while avoiding to add yet another
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@ -8,7 +8,7 @@ EXPORTS += [
    'jemalloc_types.h',
 ]

-if not CONFIG['MOZ_JEMALLOC3']:
+if not CONFIG['MOZ_JEMALLOC4']:
    SOURCES += [
        'jemalloc.c',
    ]
--- a/memory/replace/jemalloc/moz.build
+++ b/memory/replace/jemalloc/moz.build
@ -23,7 +23,7 @@ USE_LIBS += [
    'jemalloc',
 ]

-DEFINES['MOZ_JEMALLOC3'] = True
+DEFINES['MOZ_JEMALLOC4'] = True
 DEFINES['MOZ_REPLACE_JEMALLOC'] = True

 GENERATED_INCLUDES += ['../../jemalloc/src/include']
--- a/memory/replace/logalloc/replay/Replay.cpp
+++ b/memory/replace/logalloc/replay/Replay.cpp
@ -286,7 +286,7 @@ MOZ_BEGIN_EXTERN_C

 /* mozjemalloc relies on DllMain to initialize, but DllMain is not invoked
 * for executables, so manually invoke mozjemalloc initialization. */
-#if defined(_WIN32) && !defined(MOZ_JEMALLOC3)
+#if defined(_WIN32) && !defined(MOZ_JEMALLOC4)
 void malloc_init_hard(void);
 #endif

@ -487,7 +487,7 @@ main()
  FdReader reader(0);
  Replay replay;

-#if defined(_WIN32) && !defined(MOZ_JEMALLOC3)
+#if defined(_WIN32) && !defined(MOZ_JEMALLOC4)
  malloc_init_hard();
 #endif

--- a/memory/replace/moz.build
+++ b/memory/replace/moz.build
@ -10,7 +10,7 @@ DIRS += [
 ]

 # Build jemalloc3 as a replace-malloc lib when building with mozjemalloc
-if not CONFIG['MOZ_JEMALLOC3']:
+if not CONFIG['MOZ_JEMALLOC4']:
    DIRS += ['jemalloc']

 if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library':