Date: Fri, 3 Oct 2025 16:28:08 GMT From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9d0b660e6949 - stable/14 - jemalloc: Fix activating debug on WITHOUT_MALLOC_PRODUCTION Message-ID: <202510031628.593GS85r009218@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0b660e69492b3dda65735c6bc4714d259bb20a commit 9d0b660e69492b3dda65735c6bc4714d259bb20a Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2025-10-02 09:09:26 +0000 Commit: Olivier Certner <olce@FreeBSD.org> CommitDate: 2025-10-03 16:27:21 +0000 jemalloc: Fix activating debug on WITHOUT_MALLOC_PRODUCTION When stable/14 was branched, MALLOC_PRODUCTION wasn't moved from __DEFAULT_NO_OPTIONS to __DEFAULT_YES_OPTIONS but instead 'jemalloc_FreeBSD.h' was changed to stop defining JEMALLOC_DEBUG (and also, strangely, to start defining MALLOC_PRODUCTION always, although that does not have any effect in jemalloc's code). While this effectively turned off jemalloc debugging, it also prevents people from turning it on again. Additionally, leaving MALLOC_PRODUCTION in __DEFAULT_NO_OPTIONS would be confusing. Finally, this puts stable/14 in line with what was done for stable/15. This is a direct commit to stable/14. Reviewed by: markj Fixes: 29a16ce065db ("release: update stable/14 following branching from main") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52850 --- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 2 +- share/mk/src.opts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h index 493300157a70..7adb7f26b888 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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index b3f635bc5a70..0bc3d64806c9 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -145,6 +145,7 @@ __DEFAULT_YES_OPTIONS = \ MAIL \ MAILWRAPPER \ MAKE \ + MALLOC_PRODUCTION \ MLX5TOOL \ NETCAT \ NETGRAPH \ @@ -213,7 +214,6 @@ __DEFAULT_NO_OPTIONS = \ LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_FULL_DEBUGINFO \ - MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ RPCBIND_WARMSTART_SUPPORT \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510031628.593GS85r009218>