Skip to content

Commit

Permalink
Bug 1363992 - Remove jemalloc 4. r=njn
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed May 11, 2017
1 parent d1eb781 commit 1575c08
Show file tree
Hide file tree
Showing 250 changed files with 6 additions and 76,915 deletions.
1 change: 0 additions & 1 deletion .clang-format-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
^media/sphinxbase/.*
^media/webrtc/trunk/.*
^media/webrtc/signaling/src/sdp/sipcc/.*
^memory/jemalloc/src/.*
^mfbt/decimal/.*
^mfbt/double-conversion/source/.*
^mfbt/lz4.*
Expand Down
1 change: 0 additions & 1 deletion aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ builtin(include, build/autoconf/icu.m4)dnl
builtin(include, build/autoconf/clang-plugin.m4)dnl
builtin(include, build/autoconf/alloc.m4)dnl
builtin(include, build/autoconf/ios.m4)dnl
builtin(include, build/autoconf/jemalloc.m4)dnl
builtin(include, build/autoconf/sanitize.m4)dnl

MOZ_PROG_CHECKMSYS()
Expand Down
84 changes: 0 additions & 84 deletions build/autoconf/jemalloc.m4

This file was deleted.

1 change: 0 additions & 1 deletion js/src/aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ builtin(include, ../../build/autoconf/zlib.m4)dnl
builtin(include, ../../build/autoconf/icu.m4)dnl
builtin(include, ../../build/autoconf/clang-plugin.m4)dnl
builtin(include, ../../build/autoconf/alloc.m4)dnl
builtin(include, ../../build/autoconf/jemalloc.m4)dnl
builtin(include, ../../build/autoconf/sanitize.m4)dnl
builtin(include, ../../build/autoconf/ios.m4)dnl

Expand Down
1 change: 0 additions & 1 deletion js/src/make-source-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ case $cmd in
${TOPSRCDIR}/memory/moz.build \
${TOPSRCDIR}/memory/build \
${TOPSRCDIR}/memory/fallible \
${TOPSRCDIR}/memory/jemalloc \
${TOPSRCDIR}/memory/mozalloc \
${TOPSRCDIR}/memory/mozjemalloc \
${tgtpath}/memory
Expand Down
2 changes: 0 additions & 2 deletions js/src/old-configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2165,8 +2165,6 @@ AC_SUBST(JS_LIBRARY_NAME)
AC_SUBST(JS_CONFIG_MOZ_JS_LIBS)
AC_SUBST(JS_CONFIG_LIBS)

MOZ_SUBCONFIGURE_JEMALLOC()

# Avoid using obsolete NSPR features
AC_DEFINE(NO_NSPR_10_SUPPORT)

Expand Down
183 changes: 0 additions & 183 deletions memory/build/mozjemalloc_compat.c

This file was deleted.

17 changes: 4 additions & 13 deletions memory/build/mozmemory_wrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
* - jemalloc_purge_freed_pages
* - jemalloc_free_dirty_pages
* - jemalloc_thread_local_arena
* (these functions are native to mozjemalloc, and have compatibility
* implementations for jemalloc3)
* (these functions are native to mozjemalloc)
*
* These functions are all exported as part of libmozglue (see
* $(topsrcdir)/mozglue/build/Makefile.in), with a few implementation
Expand Down Expand Up @@ -88,21 +87,16 @@
* char* strdup_impl(const char *)
* That implementation would call malloc by using "malloc_impl".
*
* While mozjemalloc uses these "_impl" suffixed helpers, jemalloc3, being
* third-party code, doesn't, but instead has an elaborate way to mangle
* individual functions. See under "Run jemalloc configure script" in
* $(topsrcdir)/configure.in.
*
*
* When building with replace-malloc support, the above still holds, but
* the malloc implementation and jemalloc specific functions are the
* replace-malloc functions from replace_malloc.c.
*
* The actual jemalloc/mozjemalloc implementation is prefixed with "je_".
* The actual mozjemalloc implementation is prefixed with "je_".
*
* Thus, when MOZ_REPLACE_MALLOC is defined, the "_impl" suffixed macros
* expand to "je_" prefixed function when building mozjemalloc or
* jemalloc3/mozjemalloc_compat, where MOZ_JEMALLOC_IMPL is defined.
* expand to "je_" prefixed function when building mozjemalloc, where
* MOZ_JEMALLOC_IMPL is defined.
*
* In other cases, the "_impl" suffixed macros follow the original scheme,
* except on Windows and MacOSX, where they would expand to "je_" prefixed
Expand Down Expand Up @@ -154,9 +148,6 @@
# endif
#endif

/* 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
Expand Down
9 changes: 0 additions & 9 deletions memory/jemalloc/README.mozilla

This file was deleted.

8 changes: 0 additions & 8 deletions memory/jemalloc/helper/git

This file was deleted.

Loading

0 comments on commit 1575c08

Please sign in to comment.