svn commit: r365671 - in stable: 11 11/share/man/man5 11/share/mk 12 12/share/man/man5 12/share/mk

[Dimitry Andric]

Author: dim
Date: Sat Sep 12 19:40:04 2020
New Revision: 365671
URL: https://svnweb.freebsd.org/changeset/base/365671

Log:
  Follow-up r365662 (MFC of r365371 and r365373) by correctly setting
  WITH_MALLOC_PRODUCTION for stable branches. Also add a note to UPDATING,
  to inform users about the new setting.
  
  Direct commit to stable/{11,12} as this does not apply to head.
  
  Noticed by:	imp, Ronald Klop <ronald-lists at klop.ws>

Modified:
  stable/12/UPDATING
  stable/12/share/man/man5/src.conf.5
  stable/12/share/mk/src.opts.mk

Changes in other areas also in this revision:
Modified:
  stable/11/UPDATING
  stable/11/share/man/man5/src.conf.5
  stable/11/share/mk/src.opts.mk

Modified: stable/12/UPDATING
==============================================================================
--- stable/12/UPDATING	Sat Sep 12 19:33:25 2020	(r365670)
+++ stable/12/UPDATING	Sat Sep 12 19:40:04 2020	(r365671)
@@ -16,6 +16,18 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200912:
+	The make.conf(5) MALLOC_PRODUCTION variable, used for disabling and
+	enabling assertions and statistics gathering in malloc(3), has been
+	migrated to a src.conf(5) WITH/WITHOUT_MALLOC_PRODUCTION option.
+
+	On stable branches, WITH_MALLOC_PRODUCTION is set by default, which
+	means that malloc(3) has assertions and statistics gathering disabled,
+	for improved performance.
+
+	For backwards compatibility, the make.conf(5) MALLOC_PRODUCTION is still
+	honored, but it is now deprecated and undocumented.
+
 20200909:
 	The resume code now notifies devd with the 'kernel' system
 	rather than the old 'kern' subsystem to be consistent with

Modified: stable/12/share/man/man5/src.conf.5
==============================================================================
--- stable/12/share/man/man5/src.conf.5	Sat Sep 12 19:33:25 2020	(r365670)
+++ stable/12/share/man/man5/src.conf.5	Sat Sep 12 19:40:04 2020	(r365671)
@@ -1357,10 +1357,10 @@ if executed as an unprivileged user.
 See
 .Xr tests 7
 for more details.
-.It Va WITH_MALLOC_PRODUCTION
-Set to disable assertions and statistics gathering in
+.It Va WITHOUT_MALLOC_PRODUCTION
+Set to enable assertions and statistics gathering in
 .Xr malloc 3 .
-It also defaults the A and J runtime options to off.
+It also defaults the A and J runtime options to on.
 .It Va WITHOUT_MAN
 Set to not build manual pages.
 When set, these options are also in effect:

Modified: stable/12/share/mk/src.opts.mk
==============================================================================
--- stable/12/share/mk/src.opts.mk	Sat Sep 12 19:33:25 2020	(r365670)
+++ stable/12/share/mk/src.opts.mk	Sat Sep 12 19:40:04 2020	(r365671)
@@ -143,6 +143,7 @@ __DEFAULT_YES_OPTIONS = \
     MAIL \
     MAILWRAPPER \
     MAKE \
+    MALLOC_PRODUCTION \
     NDIS \
     NETCAT \
     NETGRAPH \
@@ -208,7 +209,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_FIREWIRE \
     LOADER_FORCE_LE \
     LOADER_VERIEXEC_PASS_MANIFEST \
-    MALLOC_PRODUCTION \
     NAND \
     OFED_EXTRA \
     OPENLDAP \