The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a0dfba69713276b987174db66d8934f7fdd95027
commit a0dfba69713276b987174db66d8934f7fdd95027 Author: Warner Losh <i...@freebsd.org> AuthorDate: 2025-08-15 21:23:27 +0000 Commit: Warner Losh <i...@freebsd.org> CommitDate: 2025-08-15 21:24:26 +0000 jemalloc: Update jemalloc.xml.in per FreeBSD-diffs Add the xml source to the FreeBSD changes to the jemalloc.3. No functional change. Sponsored by: Netflix --- contrib/jemalloc/doc/jemalloc.xml.in | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/contrib/jemalloc/doc/jemalloc.xml.in b/contrib/jemalloc/doc/jemalloc.xml.in index 7fecda7cb040..e3a111ad165b 100644 --- a/contrib/jemalloc/doc/jemalloc.xml.in +++ b/contrib/jemalloc/doc/jemalloc.xml.in @@ -53,11 +53,22 @@ <para>This manual describes jemalloc @jemalloc_version@. More information can be found at the <ulink url="http://jemalloc.net/">jemalloc website</ulink>.</para> + + <para>The following configuration options are enabled in libc's built-in + jemalloc: <option>--enable-fill</option>, + <option>--enable-lazy-lock</option>, <option>--enable-stats</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 + versions of FreeBSD (controlled by the + <constant>MK_MALLOC_PRODUCTION</constant> make variable).</para> + </refsect1> <refsynopsisdiv> <title>SYNOPSIS</title> <funcsynopsis> - <funcsynopsisinfo>#include <<filename class="headerfile">jemalloc/jemalloc.h</filename>></funcsynopsisinfo> + <funcsynopsisinfo>#include <<filename class="headerfile">stdlib.h</filename>> +#include <<filename class="headerfile">malloc_np.h</filename>></funcsynopsisinfo> <refsect2> <title>Standard API</title> <funcprototype> @@ -3510,4 +3521,18 @@ malloc_conf = "narenas:1";]]></programlisting></para> <para>The <function>posix_memalign()</function> function conforms to IEEE Std 1003.1-2001 (<quote>POSIX.1</quote>).</para> </refsect1> + <refsect1 id="history"> + <title>HISTORY</title> + <para>The <function>malloc_usable_size()</function> and + <function>posix_memalign()</function> functions first appeared in FreeBSD + 7.0.</para> + + <para>The <function>aligned_alloc()</function>, + <function>malloc_stats_print()</function>, and + <function>mallctl*()</function> functions first appeared in FreeBSD + 10.0.</para> + + <para>The <function>*allocx()</function> functions first appeared in FreeBSD + 11.0.</para> + </refsect1> </refentry>