mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 04:43:53 +00:00
Default the abort_conf malloc option to false.
This avoids troublesome backward compatibility issues.
This commit is contained in:
parent
d786d51091
commit
1a78ec8941
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=320504
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in
|
diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in
|
||||||
index 21e401ac..f977c5f5 100644
|
index 21e401ac..c26f9f4a 100644
|
||||||
--- a/doc/jemalloc.xml.in
|
--- a/doc/jemalloc.xml.in
|
||||||
+++ b/doc/jemalloc.xml.in
|
+++ b/doc/jemalloc.xml.in
|
||||||
@@ -53,11 +53,21 @@
|
@@ -53,11 +53,22 @@
|
||||||
<para>This manual describes jemalloc @jemalloc_version@. More information
|
<para>This manual describes jemalloc @jemalloc_version@. More information
|
||||||
can be found at the <ulink
|
can be found at the <ulink
|
||||||
url="http://jemalloc.net/">jemalloc website</ulink>.</para>
|
url="http://jemalloc.net/">jemalloc website</ulink>.</para>
|
||||||
|
@ -10,7 +10,8 @@ index 21e401ac..f977c5f5 100644
|
||||||
+ <para>The following configuration options are enabled in libc's built-in
|
+ <para>The following configuration options are enabled in libc's built-in
|
||||||
+ jemalloc: <option>--enable-fill</option>,
|
+ jemalloc: <option>--enable-fill</option>,
|
||||||
+ <option>--enable-lazy-lock</option>, <option>--enable-stats</option>,
|
+ <option>--enable-lazy-lock</option>, <option>--enable-stats</option>,
|
||||||
+ <option>--enable-utrace</option>, and <option>--enable-xmalloc</option>.
|
+ <option>--enable-utrace</option>, <option>--enable-xmalloc</option>, and
|
||||||
|
+ <option>--with-malloc-conf=abort_conf:false</option>.
|
||||||
+ Additionally, <option>--enable-debug</option> is enabled in development
|
+ Additionally, <option>--enable-debug</option> is enabled in development
|
||||||
+ versions of FreeBSD (controlled by the
|
+ versions of FreeBSD (controlled by the
|
||||||
+ <constant>MALLOC_PRODUCTION</constant> make variable).</para>
|
+ <constant>MALLOC_PRODUCTION</constant> make variable).</para>
|
||||||
|
@ -25,7 +26,7 @@ index 21e401ac..f977c5f5 100644
|
||||||
<refsect2>
|
<refsect2>
|
||||||
<title>Standard API</title>
|
<title>Standard API</title>
|
||||||
<funcprototype>
|
<funcprototype>
|
||||||
@@ -3252,4 +3262,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
|
@@ -3252,4 +3263,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
|
||||||
<para>The <function>posix_memalign()</function> function conforms
|
<para>The <function>posix_memalign()</function> function conforms
|
||||||
to IEEE Std 1003.1-2001 (<quote>POSIX.1</quote>).</para>
|
to IEEE Std 1003.1-2001 (<quote>POSIX.1</quote>).</para>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
|
@ -96,6 +96,7 @@ do_extract_helper() {
|
||||||
|
|
||||||
do_autogen() {
|
do_autogen() {
|
||||||
./autogen.sh --enable-xmalloc --enable-utrace \
|
./autogen.sh --enable-xmalloc --enable-utrace \
|
||||||
|
--with-malloc-conf=abort_conf:false \
|
||||||
--with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \
|
--with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \
|
||||||
--with-lg-page-sizes=12,13,14,16
|
--with-lg-page-sizes=12,13,14,16
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
.\" Title: JEMALLOC
|
.\" Title: JEMALLOC
|
||||||
.\" Author: Jason Evans
|
.\" Author: Jason Evans
|
||||||
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
|
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
|
||||||
.\" Date: 06/14/2017
|
.\" Date: 06/29/2017
|
||||||
.\" Manual: User Manual
|
.\" Manual: User Manual
|
||||||
.\" Source: jemalloc 5.0.0-4-g84f6c2cae0fb1399377ef6aea9368444c4987cc6
|
.\" Source: jemalloc 5.0.0-4-g84f6c2cae0fb1399377ef6aea9368444c4987cc6
|
||||||
.\" Language: English
|
.\" Language: English
|
||||||
.\"
|
.\"
|
||||||
.TH "JEMALLOC" "3" "06/14/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
|
.TH "JEMALLOC" "3" "06/29/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
|
||||||
.\" -----------------------------------------------------------------
|
.\" -----------------------------------------------------------------
|
||||||
.\" * Define some portability stuff
|
.\" * Define some portability stuff
|
||||||
.\" -----------------------------------------------------------------
|
.\" -----------------------------------------------------------------
|
||||||
|
@ -38,8 +38,9 @@ The following configuration options are enabled in libc\*(Aqs built\-in jemalloc
|
||||||
\fB\-\-enable\-fill\fR,
|
\fB\-\-enable\-fill\fR,
|
||||||
\fB\-\-enable\-lazy\-lock\fR,
|
\fB\-\-enable\-lazy\-lock\fR,
|
||||||
\fB\-\-enable\-stats\fR,
|
\fB\-\-enable\-stats\fR,
|
||||||
\fB\-\-enable\-utrace\fR, and
|
\fB\-\-enable\-utrace\fR,
|
||||||
\fB\-\-enable\-xmalloc\fR\&. Additionally,
|
\fB\-\-enable\-xmalloc\fR, and
|
||||||
|
\fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally,
|
||||||
\fB\-\-enable\-debug\fR
|
\fB\-\-enable\-debug\fR
|
||||||
is enabled in development versions of FreeBSD (controlled by the
|
is enabled in development versions of FreeBSD (controlled by the
|
||||||
\fBMALLOC_PRODUCTION\fR
|
\fBMALLOC_PRODUCTION\fR
|
||||||
|
|
|
@ -329,7 +329,7 @@
|
||||||
/* #undef JEMALLOC_EXPORT */
|
/* #undef JEMALLOC_EXPORT */
|
||||||
|
|
||||||
/* config.malloc_conf options string. */
|
/* config.malloc_conf options string. */
|
||||||
#define JEMALLOC_CONFIG_MALLOC_CONF ""
|
#define JEMALLOC_CONFIG_MALLOC_CONF "abort_conf:false"
|
||||||
|
|
||||||
/* If defined, jemalloc takes the malloc/free/etc. symbol names. */
|
/* If defined, jemalloc takes the malloc/free/etc. symbol names. */
|
||||||
#define JEMALLOC_IS_MALLOC 1
|
#define JEMALLOC_IS_MALLOC 1
|
||||||
|
|
Loading…
Reference in a new issue