From nobody Fri Dec 13 23:04:27 2024 X-Original-To: dev-commits-src-main@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 4Y94fN2hNfz5gH8X; Fri, 13 Dec 2024 23:04:28 +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 4Y94fN0Hzrz4mHm; Fri, 13 Dec 2024 23:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131068; 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=ODe/0UWoe9n/Uux+ljXHwfxtAMhAT1aYx9FVGyTAjsM=; b=DmN6qzEO8tFjdnaQI0wta6Gfzpj3GdiR6FcgvnvnGgEnh+C+vZcGOfXB6Xg7dfDPO7dezs QLA5eMgq3krbM0UYT3fmV71rAHb5ytrmIH4u5e8UnJDUlSEjCN5uQiaI7P9v2G5H/PKS3N EuXAa/bz3SWOIBEqrAAGBGyLBjfW2whY6MawRV4EIGfjwX+SEzACZDSpq/MxIVFALCtuWv 3WTBVNpBC+h5Z71HCHiuC1SHDy+WVhZaJRycUvQHCaKqKdT4Z4pyEiibPFCkDas2uOBQ1J z4G953oM0iw6wwRryPSxlANSwlslLqJ31IEI48ClehL8d+BnVmU8bsnznyTxxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131068; 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=ODe/0UWoe9n/Uux+ljXHwfxtAMhAT1aYx9FVGyTAjsM=; b=XCvzkCimPffX0zliIocjAcbTq0ruN7OYyCyxPc0yox469OgOssNBPG0V9BC5oY4VKnfwMi PHKJfZoIhacjepwo+lzZIOhEcEfSDKl8pcAZLg4D3uGebn1sc2qiu+EGa4fvssYfACm4Mr dWBUuflqLkTdbZ8XS2D6SIj7j8TME3KBqnZAnVkvkhfoQ7WKpOD4EXzYz0ushQRs5P0kCT wE95p4xBBxgCdSGONZSJoS8pWtdc2i6+9wfuVWXf5kusUALtVwWpzsbC/6adKAKPAmHEgG z1wdI0BosMtn44d3UzmZNMADwsUX2AHtuCXi3kJAu3kE4f3Rl816jxSjKyqO8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131068; a=rsa-sha256; cv=none; b=jyJRtFImQcJORc0+Gklw/mu8Y13c5Pucp7Q+MBTyOZ63U2g9Puv0F8YgGBp7qaqG+mYTCT 1Ml5xoi5diwbIQLeECEmBfRpYy7czWIdePwbyM57MncAwc9GaFIBdYDINXK6r85VqXa+le zbDrNsN1CUvNVDsoIYQKhPam/uZlzHwMJYfJFg+Vh3GoqGMFl0H4b7VyuzjU4Z25IwA7Iu tCKk5hi2iHu0NH7XxkCGGfdCd+XrQpX12J+pjC7d5I4K3F8ODwq9c+maRlQklhb+Ai8e4O LONpHCvOG4eAaATcWWEwiAivv9tHqeoU5ovC5zc57vwDLvwbXMSI1OmyKJ+fpA== 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 4Y94fM6hl0zxXl; Fri, 13 Dec 2024 23:04:27 +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 4BDN4R1r029162; Fri, 13 Dec 2024 23:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4RYg029159; Fri, 13 Dec 2024 23:04:27 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:27 GMT Message-Id: <202412132304.4BDN4RYg029159@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: 7fdf597e96a0 - main - jemalloc: Move generated files into lib/libc tree List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7fdf597e96a02165cfe22ff357b857d5fa15ed8a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdf597e96a02165cfe22ff357b857d5fa15ed8a commit 7fdf597e96a02165cfe22ff357b857d5fa15ed8a Author: Warner Losh AuthorDate: 2024-12-13 19:15:58 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:39 +0000 jemalloc: Move generated files into lib/libc tree Make it easire to update jemalloc by moving the FreeBSD specific files and the generated files into lib/libc. This allows us to regenerate them more easily, and emphasizes a bit that we may have to regenerate stuff from upstream. This is necessary to also unthin the import from the vendor branch as well (which will be needed to simplify the imports in the future since we are trying to use contrib/jemalloc for two different things). No functional change. Sponsored by: Netflix --- lib/libc/stdlib/malloc/jemalloc/Makefile.inc | 2 +- .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h | 0 .../jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_preamble.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/private_namespace.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/public_namespace.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_typedefs.h | 0 9 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc index 31c7a283f518..c10d79dbce6c 100644 --- a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -6,7 +6,7 @@ JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ prng.c prof.c rtree.c safety_check.c sc.c stats.c sz.c tcache.c \ test_hooks.c ticker.c tsd.c witness.c -CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include +CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include -I${LIBC_SRCTOP}/stdlib/malloc/jemalloc/include .if ${MK_JEMALLOC_LG_VADDR_WIDE} != no CFLAGS+=-D_USE_LG_VADDR_WIDE .endif diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h diff --git a/contrib/jemalloc/include/jemalloc/internal/private_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/private_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/internal/public_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/public_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h