From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 23:25:12 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 B5F174D8F2B; Fri, 22 Jan 2021 23:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMwN84kngz4YwV; Fri, 22 Jan 2021 23:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90E3326A25; Fri, 22 Jan 2021 23:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10MNPCSk052507; Fri, 22 Jan 2021 23:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10MNPCjq052506; Fri, 22 Jan 2021 23:25:12 GMT (envelope-from git) Date: Fri, 22 Jan 2021 23:25:12 GMT Message-Id: <202101222325.10MNPCjq052506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1c9891b8df63 - stable/13 - jemalloc: restore JEMALLOC_DEBUG when building WITHOUT_MALLOC_PRODUCTION MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c9891b8df63f146bd9515e11f45384bc40d0ef4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 23:25:12 -0000 The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1c9891b8df63f146bd9515e11f45384bc40d0ef4 commit 1c9891b8df63f146bd9515e11f45384bc40d0ef4 Author: Kyle Evans AuthorDate: 2021-01-22 23:13:42 +0000 Commit: Kyle Evans CommitDate: 2021-01-22 23:13:42 +0000 jemalloc: restore JEMALLOC_DEBUG when building WITHOUT_MALLOC_PRODUCTION The default for MALLOC_PRODUCTION was switched to ON in 02611ef8ee9f. This effectively reverts the jemalloc header change from bfd15705156b so that the knob behaves exactly as it does on a -CURRENT; that is, we are effectively doing: WITH_MALLOC_PRODUCTION -> -DMALLOC_PRODUCTION (default for stable/* and on) WITHOUT_MALLOC_PRODUCTION -> -DJEMALLOC_DEBUG (default for main) This allows the knob to be used for debugging on stable branches, too, which is believed to be the main reason one would want to twist it off. (direct commit) --- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h index dfda508ea1e1..6ff0ce18d5da 100644 --- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h +++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h @@ -5,7 +5,7 @@ #undef JEMALLOC_OVERRIDE_VALLOC #ifndef MALLOC_PRODUCTION -#define MALLOC_PRODUCTION +#define JEMALLOC_DEBUG #endif #undef JEMALLOC_DSS