svn commit: r365371 - in head: . contrib/jemalloc contrib/jemalloc/doc lib/libc/stdlib/jemalloc share/man/man5 share/mk tools/build/options

[John Baldwin]

On 9/5/20 4:30 PM, Dimitry Andric wrote:
> Author: dim
> Date: Sat Sep  5 23:30:17 2020
> New Revision: 365371
> URL: https://svnweb.freebsd.org/changeset/base/365371
> 
> Log:
>   Turn MALLOC_PRODUCTION into a regular src.conf(5) option
>   
> Added: head/tools/build/options/WITHOUT_MALLOC_PRODUCTION
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/tools/build/options/WITHOUT_MALLOC_PRODUCTION	Sat Sep  5 23:30:17 2020	(r365371)
> @@ -0,0 +1,5 @@
> +.\" $FreeBSD$
> +Set to enable assertions and statistics gathering in
> +.Xr malloc 3 .
> +It also defaults the A and J runtime options to on.
> +Enabled by default on -CURRENT.
> 
> Added: head/tools/build/options/WITH_MALLOC_PRODUCTION
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/tools/build/options/WITH_MALLOC_PRODUCTION	Sat Sep  5 23:30:17 2020	(r365371)
> @@ -0,0 +1,5 @@
> +.\" $FreeBSD$
> +Set to disable assertions and statistics gathering in
> +.Xr malloc 3 .
> +It also defaults the A and J runtime options to off.
> +Disabled by default on -CURRENT.

I think this last sentence doesn't quite read correctly.  That is,
I read it as saying that "assertions and statistics gathering" is
disabled by default on -CURRENT, which isn't correct.  It also
won't be very meaningful to someone reading src.conf.5 on a stable
branch if this is MFC'd (or when it ends up in stable/13).

I think it would be best to just leave the last sentence
off completely.  The result would be that on head src.conf(5) would
say:

WITH_MALLOC_PRODUCTION

   Set to disable assertions...

And on stable src.conf(5) would say:

WITHOUT_MALLOC_PRODUCTION

   Set to enable assertions...

Just as when other defaults change across branches, the current vs
stable different is handled by the contents of src.conf.5 on each
branch.

-- 
John Baldwin