From nobody Fri Aug 15 21:27:37 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 4c3Zvb6pRYz64KPp; Fri, 15 Aug 2025 21:27:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c3ZvZ2pV0z3XlM; Fri, 15 Aug 2025 21:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755293259; 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=aSdd2gjPYm4nsSH5jZmYe+9tBUtKsNZwXZU+gWezwh4=; b=JMDX2vapYbZJHhZ/Nif65zzqXjlHhfUReOoeErmOzBKAI9H4Mq0+r8QZmjmhK0pRuxZlRE YgIU0bkInsmJwlPAq94v1wE2Yh0r5pTf8hX5lvCAXsagXPC01MTcQjbvgPwqBKWrmRvW5X X+CfYDYE83Tr54dHw2lEHFb+nnDYyy0a35lBXkoLx98oR5itbehwLjBsfXxWO6sttJG6v1 VhdqPw9pUBYmVK2bVNNrxTvKhjA75+l50ZoK25SlrqBguuiT4x96P1gYeQ1Rd38uA8J4eG fFf+PCZcDBuRXgd188dJGa2QvHIuNvznaFpj1yC22XyHUH5U68DzowVL8+p7tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755293259; 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=aSdd2gjPYm4nsSH5jZmYe+9tBUtKsNZwXZU+gWezwh4=; b=HgO+7YT4YZE+wVpULGPsRz6it8KcAYlh/ZgYlYG5ohO80kcjEur+S9LacScZemOHMRIbpv 3ig8hi29yyxG4R8grh0vjr8jBgz3D30YHJ1OTQVquL3/APVukrnui2v02jBkM4cXveh1/F qZmCuP81Nf7ODSTtUkJ/rnjZiUMd9OpKsbRZk8xgIy3FKm1ZnFHDxTac4EuQfv7Q/hO5Hp r7s/WavCYIPPp1Twkb5ASGJuA8mr5TPhTd0P+ZjJmKsxrDujVoigP5SlyTJeWYePnjUIRq 50uKvUUUQ+06u/zQB9qcCENXylHIq7X7/rhai5GnusfdqllqCjAQDHKH33F8nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755293259; a=rsa-sha256; cv=none; b=bvFGPZm2Ml+TRXyIAfuTsLiKJs3amQZSEH2+m4XOsp7bryhURCMLAMrE8w5ufC+8aBXKSJ i0tLfoLDM43oWGRktDwSO4ua4sr4c7RxYFKnH8w8DLz8MdHBFrx5RACP3ZsbWMCf2P/2Aq tLd9XpCGpbOrQwVTsTqeKC8fqnXwotQ70XoKTtdqmakzRAQPHL0sUfoiQC19tYvm7d9e3t f8ximN4J2P9Gugk176xq9phhVVtzx4CLM34nON6h0n0FbRvsV6HaCs8tKwCiNINt3/DbNm FzsWw7TQK2PEEgHRixWsx74CAXwpSu9crAha1/wvQzj33H0KyZHJpiNo/3H7BA== 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 4c3ZvY3qhKzv24; Fri, 15 Aug 2025 21:27:37 +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 57FLRblH086487; Fri, 15 Aug 2025 21:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FLRbYT086484; Fri, 15 Aug 2025 21:27:37 GMT (envelope-from git) Date: Fri, 15 Aug 2025 21:27:37 GMT Message-Id: <202508152127.57FLRbYT086484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: da260ab23f26 - main - jemalloc: Only replace _pthread_mutex_init_calloc_cb in private namespace 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da260ab23f26cea5569ff8ecd83eeb49411af233 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=da260ab23f26cea5569ff8ecd83eeb49411af233 commit da260ab23f26cea5569ff8ecd83eeb49411af233 Author: Warner Losh AuthorDate: 2025-08-15 21:23:36 +0000 Commit: Warner Losh CommitDate: 2025-08-15 21:24:46 +0000 jemalloc: Only replace _pthread_mutex_init_calloc_cb in private namespace When we're not doing the private namespace remap, we don't need to do this pragma. This is needed for the bootstrapping path when we import a new version of jemalloc. No functional change. Sponsored by: Netflix --- contrib/jemalloc/src/mutex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/jemalloc/src/mutex.c b/contrib/jemalloc/src/mutex.c index 88a7730c64c1..6e2989aa4d9f 100644 --- a/contrib/jemalloc/src/mutex.c +++ b/contrib/jemalloc/src/mutex.c @@ -42,6 +42,7 @@ pthread_create(pthread_t *__restrict thread, JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, void *(calloc_cb)(size_t, size_t)); +#ifndef JEMALLOC_NO_PRIVATE_NAMESPACE #pragma weak _pthread_mutex_init_calloc_cb int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, @@ -53,6 +54,7 @@ _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, calloc_cb)); } #endif +#endif void malloc_mutex_lock_slow(malloc_mutex_t *mutex) {