lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-24 13:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the --disable-munmap option.

Browse Source 
Add the --disable-munmap option, remove the configure test that
attempted to detect the VM allocation quirk known to exist on Linux
x86[_64], and make --disable-munmap implicit on Linux.
This commit is contained in:
Jason Evans
2012-04-16 17:52:27 -07:00
parent a398a6b46e
commit 59ae2766af
4 changed files with 39 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
configure.ac
View File

@@ -206,6 +206,7 @@ dnl
dnl Define cpp macros in CPPFLAGS, rather than doing AC_DEFINE(macro), since the
dnl definitions need to be seen before any headers are included, which is a pain
dnl to make happen otherwise.
default_munmap="1"
case "${host}" in
*-*-darwin*)
CFLAGS="$CFLAGS -fno-common"
@@ -230,6 +231,7 @@ case "${host}" in
AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
RPATH="-Wl,-rpath,"
default_munmap="0"
;;
*-*-netbsd*)
AC_MSG_CHECKING([ABI])
@@ -667,6 +669,22 @@ if test "x$enable_tcache" = "x1" ; then
fi
AC_SUBST([enable_tcache])
dnl Enable VM deallocation via munmap() by default.
AC_ARG_ENABLE([munmap],
[AS_HELP_STRING([--disable-munmap], [Disable VM deallocation via munmap(2)])],
[if test "x$enable_munmap" = "xno" ; then
enable_munmap="0"
else
enable_munmap="1"
fi
],
[enable_munmap="${default_munmap}"]
)
if test "x$enable_munmap" = "x1" ; then
AC_DEFINE([JEMALLOC_MUNMAP], [ ])
fi
AC_SUBST([enable_munmap])
dnl Do not enable allocation from DSS by default.
AC_ARG_ENABLE([dss],
[AS_HELP_STRING([--enable-dss], [Enable allocation from DSS])],
@@ -817,72 +835,6 @@ else
AC_MSG_ERROR([cannot determine value for STATIC_PAGE_SHIFT])
fi
dnl Determine whether common sequences of mmap()/munmap() calls will leave
dnl semi-permanent VM map holes. If so, disable munmap.
AC_CACHE_CHECK([whether munmap() leaves semi-permanent VM map holes],
[je_cv_vmmap_hole],
AC_RUN_IFELSE([AC_LANG_PROGRAM(
[[#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#define MMAP_SIZE ((size_t)(1U << 22))
static void *
do_mmap(size_t size)
{
void *ret;
ret = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1,
0);
if (ret == MAP_FAILED) {
fprintf(stderr, "mmap() error\n");
exit(1);
}
return (ret);
}
static void
do_munmap(void *ptr, size_t size)
{
if (munmap(ptr, size) == -1) {
fprintf(stderr, "munmap() error\n");
exit(1);
}
}
]],
[[
void *p0, *p1, *p2, *p3, *p4;
FILE *f;
f = fopen("conftest.out", "w");
if (f == NULL)
exit(1);
p0 = do_mmap(MMAP_SIZE);
p1 = do_mmap(MMAP_SIZE);
p2 = do_mmap(MMAP_SIZE);
do_munmap(p1, MMAP_SIZE);
p3 = do_mmap(MMAP_SIZE * 2);
do_munmap(p3, MMAP_SIZE * 2);
p4 = do_mmap(MMAP_SIZE);
if (p4 != p1) {
fprintf(stderr, "Hoped for %p, got %p\n", p1, p4);
fprintf(stderr, "%p..%p..%p..%p..%p\n", p0, p1, p2, p3, p4);
fprintf(f, "yes\n");
} else
fprintf(f, "no\n");
fclose(f);
return (0);
]])],
[je_cv_vmmap_hole=`cat conftest.out`],
[je_cv_vmmap_hole=unknown]))
if test "x$je_cv_vmmap_hole" = "xno" ; then
AC_DEFINE([JEMALLOC_MUNMAP], [ ])
fi
dnl ============================================================================
dnl jemalloc configuration.
dnl
@@ -1198,6 +1150,7 @@ AC_MSG_RESULT([fill : ${enable_fill}])
AC_MSG_RESULT([utrace : ${enable_utrace}])
AC_MSG_RESULT([valgrind : ${enable_valgrind}])
AC_MSG_RESULT([xmalloc : ${enable_xmalloc}])
AC_MSG_RESULT([munmap : ${enable_munmap}])
AC_MSG_RESULT([dss : ${enable_dss}])
AC_MSG_RESULT([lazy_lock : ${enable_lazy_lock}])
AC_MSG_RESULT([tls : ${enable_tls}])