From nobody Fri Dec 13 23:04:25 2024 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 4Y94fK6QGQz5gH8T; Fri, 13 Dec 2024 23:04:25 +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 4Y94fK5qYbz4mVG; Fri, 13 Dec 2024 23:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131065; 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=vbW0i+O937ShGz7HxlFiscKOnA8axF3Vtl/PZukYNf4=; b=w+JqKyUNhXa0VVJuou8WD6j0zr0hnI8F9/BQtUUCvVXF21lYMyQpaubQcn5PP5zz9xAlkH Pa5px6E8R+oV2V41a7Q3XcO54Swwao858ciFtsZnGfEyIDJPW2ib3JuApPKRTfvIbKKekZ I6+A8IVTPhG9IcWGwpIjqlNu2z2UcTdnzKey8anW4RqtHs/RZraOI5J4xAXMluO6P8vQ9M j5body5HBFIzNZgPBYrZ0DO91y3QGvdKfgqUb7PstFsDhFsxSRFHBHsJpn8wEJgIfm8ofp OHE4WYe7DTXesnrXjL96Uy/nw06LRMi4Jhq82I5npUd3Y7ixj5JOh99qnHmWoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131065; 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=vbW0i+O937ShGz7HxlFiscKOnA8axF3Vtl/PZukYNf4=; b=Zc8juOhtHeSzIvxPNLcHzAaJhDXAw8pRe9Ngn4+H0iJWkVBr6YI2UexQraj2JgPKtU2Znk SbKtVYvBr+lvMjWzof6saTLNfRQ8pPypKS1z3wzmLzx/3JB2aMYOx8Oxr2a+za4VCaaF0Q OFLvs4NeTqXEND0reqp2cOneh0/BY56JMqlPUIvhk8LKPWlID6lBn9nRmRRd9AmNRlewIF jeCDSYyzj7+4qVNuI7e5gIbsgpsRrsFQIssCNNmeQvUEaqpjk/eRUENuwrtuda8TExgelo i0sVZFmt5dbEtEvfRhkq/sscfUrB2oN1OLTFZl4qy2nKYunSb18FYAcRos8MGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131065; a=rsa-sha256; cv=none; b=svfGNitC6c92+FWPANy1XCj0cO7C3NTYQnM/wm02eNLECKiiqLC//UYXLtvyAfZJo2esD2 cwGuKd+F/JOj2QLoITjh70SivVMZgm/c7+EaNeJkoAG6OlU7bSrsqSsM8oN/DiwZzXo6gw yVcS1Ky1SosTh3ICl1+fwpGhF5ef1aamwYujrWYdA5BsTh5k/rN9ewUiAVgCyEV/tDl9dJ cpNjlnEf6BxjHUwRwAcc27km5MwOoppV3VpoMkUN0HvXyJ8Bl5G1otjp2omiF5T5Ogx2E0 Nrt/JR4kk4m7YvgFLt8abhYFlsbxe18KsKoB7VzI8QVzGdtG4AASAW4R9tZ5Cg== 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 4Y94fK5Qtxzxb8; Fri, 13 Dec 2024 23:04:25 +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 4BDN4PG6029062; Fri, 13 Dec 2024 23:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4PGV029059; Fri, 13 Dec 2024 23:04:25 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:25 GMT Message-Id: <202412132304.4BDN4PGV029059@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: b55f5e1c4ae3 - main - jemalloc: Move generated jemalloc.3 into lib/libc tree 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: b55f5e1c4ae375d92dfd597901f238a230e868da Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b55f5e1c4ae375d92dfd597901f238a230e868da commit b55f5e1c4ae375d92dfd597901f238a230e868da Author: Warner Losh AuthorDate: 2024-12-13 17:11:51 +0000 Commit: Warner Losh CommitDate: 2024-12-13 22:58:31 +0000 jemalloc: Move generated jemalloc.3 into lib/libc tree The more generated things that are in contrib/jemalloc tree, the more chances for interference goes way up. So, move this file into our lib/libc tree. I didn't add a 'generated file' line / info, but this is funky enough I don't think we need that. We do add things to the man page, and that should be tracked in the contrib/jemalloc tree to allow better importing experience. Sponsored by: Netflix --- lib/libc/stdlib/malloc/jemalloc/Makefile.inc | 7 +++---- .../jemalloc/doc => lib/libc/stdlib/malloc/jemalloc}/jemalloc.3 | 0 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc index d916d69f471f..31c7a283f518 100644 --- a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -1,3 +1,5 @@ +.PATH: ${LIBC_SRCTOP}/stdlib/malloc/jemalloc + JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ ckh.c ctl.c div.c extent.c extent_dss.c extent_mmap.c hash.c hook.c \ large.c log.c malloc_io.c mutex.c mutex_pool.c nstime.c pages.c \ @@ -16,10 +18,7 @@ jemalloc_${src}: ${SRCTOP}/contrib/jemalloc/src/${src} .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endfor -MAN+=jemalloc.3 -CLEANFILES+=jemalloc.3 -jemalloc.3: ${SRCTOP}/contrib/jemalloc/doc/jemalloc.3 .NOMETA - ln -sf ${.ALLSRC} ${.TARGET} +MAN+= jemalloc.3 MLINKS+= \ jemalloc.3 malloc.3 \ diff --git a/contrib/jemalloc/doc/jemalloc.3 b/lib/libc/stdlib/malloc/jemalloc/jemalloc.3 similarity index 100% rename from contrib/jemalloc/doc/jemalloc.3 rename to lib/libc/stdlib/malloc/jemalloc/jemalloc.3