From nobody Fri Oct 3 16:28:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cdYxP0Mfqz6B84f; Fri, 03 Oct 2025 16:28:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cdYxN6sFpz49mB; Fri, 03 Oct 2025 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759508889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sclv/V/o9zCnhSFOqQ8I4ILqit9yNZG9emdSPcGDYjo=; b=x8u41IV2hWF/NSYmaHmPSjzmpfzIYdTy4GMdL+Pp/yWYlXm0UNFTfi2y/Rdj7d+WrzUW3v vT1eImyKDzJCX6uF+l7aGu5YqxjaTTN9E5pdflOwlh4W+kWT9gqRQiOfFhZlQj7Yals5mX yX8tgU3nOafPDSJZM+Onwlzint23Ef5AiNSIcSdEUzcBGvaZEMiM0I7+dQhm0p99rHqbux 02jXO/VB6F2PIzKMqgi4LlcRyosrCnAkkQOvMwkxPUBJa+K/L9aIIWgxfFynS0ALo7SxKd Tvmb+qjy6aRyAg6nWWrgGu0nfWBajFB3lt8PaBtzPt9jYpV03O+KeTs0PTQdlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759508889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sclv/V/o9zCnhSFOqQ8I4ILqit9yNZG9emdSPcGDYjo=; b=Gkgi35nSnw7kHK6iCFte/E8te4QkX1vBTIIxCu3cUBMe2VNQ4viConeCXfO9mdL6wukCLG CBoFPg/NhlojNpN1DCabG/uOOqt/PHEUi1O4ejPYn+bpPjTbcP4e5gA4JNoXg5Kz4uyiFe 9Q2/GkzT8vVsa/Wd/Xyd5/5WAy3LAjMOQWP7DVmUKODRgwuMSkpeI+vufKTajkg6Lti0iB PnH16S16uhHNNt100oWXpx9v0wPdE4czMZQuDQwK3Fi9RLs9XliNh1gglMfyB6LeH8d1Zu Ib/zjG2AXWPUsyMBodn12O4DtUjOT2akZUOzpa0OLcqIpOz8Q+oz+eebL/wvIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759508889; a=rsa-sha256; cv=none; b=oFyyTu0MtkBqA8wLhJbZMbPdmxVWeZg8AGsCjxdP1uOm4vsPl9c0a5y5rgUDl4OIdYPUzF ozWUQ40y5afoXsZnOBGvJyHFCUkXz3KlOjWyEw/9hH5PSIrGFqvQr20bDWUh6wDo2lPUay jgNLtsrFGV+HbNIo7bIaKHvqNpCWvT/bbabInZHh9PP4QcfKsttxFZQ24xbb02lMjmpsD3 cYDhR/ByUO+I13B7/xiqS+cbbMNdc7FMpPXDmYRfqu/1CIoEPqyCmK2OKAUyl/2EW80FzI t+Nd0V5VjY1+g/rXlRg3TnlwGCjpWoF6xue8l6PQkGNRtpFGK4SkU2wWx+VoaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cdYxN6Gdvz124K; Fri, 03 Oct 2025 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 593GS8V1009221; Fri, 3 Oct 2025 16:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GS85r009218; Fri, 3 Oct 2025 16:28:08 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:28:08 GMT Message-Id: <202510031628.593GS85r009218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9d0b660e6949 - stable/14 - jemalloc: Fix activating debug on WITHOUT_MALLOC_PRODUCTION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d0b660e69492b3dda65735c6bc4714d259bb20a Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0b660e69492b3dda65735c6bc4714d259bb20a commit 9d0b660e69492b3dda65735c6bc4714d259bb20a Author: Olivier Certner AuthorDate: 2025-10-02 09:09:26 +0000 Commit: Olivier Certner 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 \