From owner-svn-src-all@freebsd.org Sat Sep 12 19:13:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6551F3E0819; Sat, 12 Sep 2020 19:13:18 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpj2N5FDzz4PXS; Sat, 12 Sep 2020 19:13:15 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp.greenhost.nl ([213.108.110.112]) by smarthost1.greenhost.nl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kHAxU-0003Tb-Q8; Sat, 12 Sep 2020 21:13:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=klop.ws; s=mail; h=In-Reply-To:Message-ID:From:Content-Transfer-Encoding:MIME-Version: Date:References:Subject:To:Content-Type:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/rzhUdtBbmwJFFhT42vPB+pj5W+IxfbDkgRKBkwoG+M=; b=kaE3MB5FHRfEOmK9xxLAs/6tRi vOqBigIb33o3cP/emQchOvYo0nI7tNKDtwC+hFvPCWQDMi0Z3Q1PNwq9riHV2TZcHt7UXrNkAYFiM mYWB6I+ps3cZefJyN5P+3F02owx6Q5G9y0/D7ZhPNT32Hw/Ob421sJSrxKMi+csnVOfs=; Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org, "Dimitry Andric" Subject: Re: svn commit: r365662 - in stable: 11/contrib/jemalloc 11/contrib/jemalloc/doc 11/lib/libc/stdlib/jemalloc 11/share/man/man5 11/share/mk 11/tools/build/options 12/contrib/jemalloc 12/contrib/jemalloc... References: <202009121650.08CGo5Eq079753@repo.freebsd.org> Date: Sat, 12 Sep 2020 21:13:10 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: <202009121650.08CGo5Eq079753@repo.freebsd.org> User-Agent: Opera Mail/12.16 (FreeBSD) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.4 X-Spam-Status: No, score=-0.4 required=5.0 tests=ALL_TRUSTED, BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF autolearn=disabled version=3.4.2 X-Scan-Signature: 1629bd954af37e9bd463cbe85bf61e19 X-Rspamd-Queue-Id: 4Bpj2N5FDzz4PXS X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=klop.ws header.s=mail header.b=kaE3MB5F; dmarc=none; spf=pass (mx1.freebsd.org: domain of ronald-lists@klop.ws designates 195.190.28.88 as permitted sender) smtp.mailfrom=ronald-lists@klop.ws X-Spamd-Result: default: False [-1.77 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.05)[-1.051]; R_DKIM_ALLOW(-0.20)[klop.ws:s=mail]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.190.28.64/27]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[klop.ws]; NEURAL_HAM_LONG(-0.99)[-0.990]; RWL_MAILSPIKE_GOOD(0.00)[195.190.28.88:from]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_SPAM_SHORT(0.27)[0.268]; DKIM_TRACE(0.00)[klop.ws:+]; RCVD_IN_DNSWL_NONE(0.00)[195.190.28.88:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:47172, ipnet:195.190.28.0/24, country:NL]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-stable,svn-src-stable-12]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 19:13:18 -0000 Hi, Isn't this important enough for a note in UPDATING? Or a message in the backwards compatibility code to point the user to the new setting? Regards, Ronald. On Sat, 12 Sep 2020 18:50:05 +0200, Dimitry Andric wrote: > Author: dim > Date: Sat Sep 12 16:50:04 2020 > New Revision: 365662 > URL: https://svnweb.freebsd.org/changeset/base/365662 > > Log: > MFC r365371: > Turn MALLOC_PRODUCTION into a regular src.conf(5) option > For historical reasons, defining MALLOC_PRODUCTION in /etc/make.conf has > been used to turn off potentially expensive debug checks and statistics > gathering in the implementation of malloc(3). > It seems more consistent to turn this into a regular src.conf(5) option, > e.g. WITH_MALLOC_PRODUCTION / WITHOUT_MALLOC_PRODUCTION. This can then > be toggled similar to any other source build option, and turned on or > off by default for e.g. stable branches. > Reviewed by: imp, #manpages > Differential Revision: https://reviews.freebsd.org/D26337 > MFC r365373: > Follow-up r365371 by removing sentences which indicate the state of the > MK_MALLOC_PRODUCTION option on -CURRENT. > Also, for the sake of backwards compatibility, support the old way of > enabling 'production malloc', e.g. by adding a define in make.conf(5). > > Added: > stable/12/tools/build/options/WITHOUT_MALLOC_PRODUCTION > - copied, changed from r365371, > head/tools/build/options/WITHOUT_MALLOC_PRODUCTION > stable/12/tools/build/options/WITH_MALLOC_PRODUCTION > - copied, changed from r365371, > head/tools/build/options/WITH_MALLOC_PRODUCTION > Modified: > stable/12/contrib/jemalloc/FREEBSD-diffs > stable/12/contrib/jemalloc/doc/jemalloc.3 > stable/12/lib/libc/stdlib/jemalloc/Makefile.inc > stable/12/share/man/man5/make.conf.5 > stable/12/share/man/man5/src.conf.5 > stable/12/share/mk/src.opts.mk > Directory Properties: > stable/12/ (props changed) > > Changes in other areas also in this revision: > Added: > stable/11/tools/build/options/WITHOUT_MALLOC_PRODUCTION > - copied, changed from r365371, > head/tools/build/options/WITHOUT_MALLOC_PRODUCTION > stable/11/tools/build/options/WITH_MALLOC_PRODUCTION > - copied, changed from r365371, > head/tools/build/options/WITH_MALLOC_PRODUCTION > Modified: > stable/11/contrib/jemalloc/FREEBSD-diffs > stable/11/contrib/jemalloc/doc/jemalloc.3 > stable/11/lib/libc/stdlib/jemalloc/Makefile.inc > stable/11/share/man/man5/make.conf.5 > stable/11/share/man/man5/src.conf.5 > stable/11/share/mk/src.opts.mk > Directory Properties: > stable/11/ (props changed) > > Modified: stable/12/contrib/jemalloc/FREEBSD-diffs > ============================================================================== > --- stable/12/contrib/jemalloc/FREEBSD-diffs Sat Sep 12 16:33:05 > 2020 (r365661) > +++ stable/12/contrib/jemalloc/FREEBSD-diffs Sat Sep 12 16:50:04 > 2020 (r365662) > @@ -14,7 +14,7 @@ index 1e12fd3a..c42a7e10 100644 > + . > + Additionally, is enabled in > development > + versions of FreeBSD (controlled by the > -+ MALLOC_PRODUCTION make variable). > ++ MK_MALLOC_PRODUCTION make variable). > + > > > > Modified: stable/12/contrib/jemalloc/doc/jemalloc.3 > ============================================================================== > --- stable/12/contrib/jemalloc/doc/jemalloc.3 Sat Sep 12 16:33:05 > 2020 (r365661) > +++ stable/12/contrib/jemalloc/doc/jemalloc.3 Sat Sep 12 16:50:04 > 2020 (r365662) > @@ -43,7 +43,7 @@ The following configuration options are enabled in lib > \fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally, > \fB\-\-enable\-debug\fR > is enabled in development versions of FreeBSD (controlled by the > -\fBMALLOC_PRODUCTION\fR > +\fBMK_MALLOC_PRODUCTION\fR > make variable)\&. > .SH "SYNOPSIS" > .sp > > Modified: stable/12/lib/libc/stdlib/jemalloc/Makefile.inc > ============================================================================== > --- stable/12/lib/libc/stdlib/jemalloc/Makefile.inc Sat Sep 12 16:33:05 > 2020 (r365661) > +++ stable/12/lib/libc/stdlib/jemalloc/Makefile.inc Sat Sep 12 16:50:04 > 2020 (r365662) > @@ -44,6 +44,6 @@ MLINKS+= \ > jemalloc.3 nallocx.3 \ > jemalloc.3 malloc.conf.5 > -.if defined(MALLOC_PRODUCTION) > +.if ${MK_MALLOC_PRODUCTION} != "no" || defined(MALLOC_PRODUCTION) > CFLAGS+= -DMALLOC_PRODUCTION > .endif > > Modified: stable/12/share/man/man5/make.conf.5 > ============================================================================== > --- stable/12/share/man/man5/make.conf.5 Sat Sep 12 16:33:05 > 2020 (r365661) > +++ stable/12/share/man/man5/make.conf.5 Sat Sep 12 16:50:04 > 2020 (r365662) > @@ -401,12 +401,6 @@ console driver to > and allow access over FireWire(IEEE1394) using > .Xr dconschat 8 . > Currently, only i386 and amd64 are supported. > -.It Va MALLOC_PRODUCTION > -.Pq Vt bool > -Set this 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. > .It Va MAN_ARCH > .Pq Vt str > Space-delimited list of one or more MACHINE and/or MACHINE_ARCH values > > Modified: stable/12/share/man/man5/src.conf.5 > ============================================================================== > --- stable/12/share/man/man5/src.conf.5 Sat Sep 12 16:33:05 > 2020 (r365661) > +++ stable/12/share/man/man5/src.conf.5 Sat Sep 12 16:50:04 > 2020 (r365662) > @@ -1,6 +1,6 @@ > .\" DO NOT EDIT-- this file is @generated by > tools/build/options/makeman. > .\" $FreeBSD$ > -.Dd September 11, 2020 > +.Dd September 12, 2020 > .Dt SRC.CONF 5 > .Os > .Sh NAME > @@ -1357,6 +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 > +.Xr malloc 3 . > +It also defaults the A and J runtime options to off. > .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 16:33:05 2020 (r365661) > +++ stable/12/share/mk/src.opts.mk Sat Sep 12 16:50:04 2020 (r365662) > @@ -208,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \ > LOADER_FIREWIRE \ > LOADER_FORCE_LE \ > LOADER_VERIEXEC_PASS_MANIFEST \ > + MALLOC_PRODUCTION \ > NAND \ > OFED_EXTRA \ > OPENLDAP \ > > Copied and modified: > stable/12/tools/build/options/WITHOUT_MALLOC_PRODUCTION (from r365371, > head/tools/build/options/WITHOUT_MALLOC_PRODUCTION) > ============================================================================== > --- head/tools/build/options/WITHOUT_MALLOC_PRODUCTION Sat Sep 5 > 23:30:17 2020 (r365371, copy source) > +++ stable/12/tools/build/options/WITHOUT_MALLOC_PRODUCTION Sat Sep 12 > 16:50:04 2020 (r365662) > @@ -2,4 +2,3 @@ > 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. > > Copied and modified: > stable/12/tools/build/options/WITH_MALLOC_PRODUCTION (from r365371, > head/tools/build/options/WITH_MALLOC_PRODUCTION) > ============================================================================== > --- head/tools/build/options/WITH_MALLOC_PRODUCTION Sat Sep 5 23:30:17 > 2020 (r365371, copy source) > +++ stable/12/tools/build/options/WITH_MALLOC_PRODUCTION Sat Sep 12 > 16:50:04 2020 (r365662) > @@ -2,4 +2,3 @@ > 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. > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"