project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the default option of zero realloc match the system allocator.

Browse Source
This commit is contained in:
Qi Wang 2022-05-03 15:41:43 -07:00 committed by Qi Wang
parent 66c889500a
commit 8cb814629a
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -638,6 +638,7 @@ 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 definitions need to be seen before any headers are included, which is a pain
dnl to make happen otherwise. dnl to make happen otherwise.
default_retain="0" default_retain="0"
zero_realloc_default_free="0"
maps_coalesce="1" maps_coalesce="1"
DUMP_SYMS="${NM} -a" DUMP_SYMS="${NM} -a"
SYM_PREFIX="" SYM_PREFIX=""
@ -684,6 +685,7 @@ case "${host}" in
if test "${LG_SIZEOF_PTR}" = "3"; then if test "${LG_SIZEOF_PTR}" = "3"; then
default_retain="1" default_retain="1"
fi fi
zero_realloc_default_free="1"
;; ;;
*-*-linux*) *-*-linux*)
dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE. dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE.
@ -698,6 +700,7 @@ case "${host}" in
if test "${LG_SIZEOF_PTR}" = "3"; then if test "${LG_SIZEOF_PTR}" = "3"; then
default_retain="1" default_retain="1"
fi fi
zero_realloc_default_free="1"
;; ;;
*-*-kfreebsd*) *-*-kfreebsd*)
dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE. dnl syscall(2) and secure_getenv(3) are exposed by _GNU_SOURCE.
@ -773,6 +776,7 @@ case "${host}" in
if test "${LG_SIZEOF_PTR}" = "3"; then if test "${LG_SIZEOF_PTR}" = "3"; then
default_retain="1" default_retain="1"
fi fi
zero_realloc_default_free="1"
;; ;;
*-*-nto-qnx) *-*-nto-qnx)
abi="elf" abi="elf"
@ -1395,6 +1399,11 @@ if test "x$default_retain" = "x1" ; then
AC_DEFINE([JEMALLOC_RETAIN], [ ], [ ]) AC_DEFINE([JEMALLOC_RETAIN], [ ], [ ])
fi fi
dnl Indicate whether realloc(ptr, 0) defaults to the "alloc" behavior.
if test "x$zero_realloc_default_free" = "x1" ; then
AC_DEFINE([JEMALLOC_ZERO_REALLOC_DEFAULT_FREE], [ ], [ ])
fi
dnl Enable allocation from DSS if supported by the OS. dnl Enable allocation from DSS if supported by the OS.
have_dss="1" have_dss="1"
dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support. dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support.

3
doc/jemalloc.xml.in
View File

@ -1584,7 +1584,8 @@ malloc_conf = "xmalloc:true";]]></programlisting>
<quote>free</quote> treats this as a deallocation of the pointer, and <quote>free</quote> treats this as a deallocation of the pointer, and
returns <constant>NULL</constant> without setting returns <constant>NULL</constant> without setting
<varname>errno</varname>. <quote>abort</quote> aborts the process if <varname>errno</varname>. <quote>abort</quote> aborts the process if
zero is passed. The default is <quote>alloc</quote>.</para> zero is passed. The default is <quote>free</quote> on Linux and
Windows, and <quote>alloc</quote> elsewhere.</para>
<para>There is considerable divergence of behaviors across <para>There is considerable divergence of behaviors across
implementations in handling this case. Many have the behavior of implementations in handling this case. Many have the behavior of

3
include/jemalloc/internal/jemalloc_internal_defs.h.in
View File

@ -421,4 +421,7 @@
/* Darwin VM_MAKE_TAG support */ /* Darwin VM_MAKE_TAG support */
#undef JEMALLOC_HAVE_VM_MAKE_TAG #undef JEMALLOC_HAVE_VM_MAKE_TAG
/* If defined, realloc(ptr, 0) defaults to "free" instead of "alloc". */
#undef JEMALLOC_ZERO_REALLOC_DEFAULT_FREE
#endif /* JEMALLOC_INTERNAL_DEFS_H_ */ #endif /* JEMALLOC_INTERNAL_DEFS_H_ */

7
src/jemalloc.c
View File

@ -112,7 +112,12 @@ bool opt_cache_oblivious =
; ;
zero_realloc_action_t opt_zero_realloc_action = zero_realloc_action_t opt_zero_realloc_action =
zero_realloc_action_alloc; #ifdef JEMALLOC_ZERO_REALLOC_DEFAULT_FREE
zero_realloc_action_free
#else
zero_realloc_action_alloc
#endif
;
atomic_zu_t zero_realloc_count = ATOMIC_INIT(0); atomic_zu_t zero_realloc_count = ATOMIC_INIT(0);