From nobody Wed Aug 16 18:20:13 2023 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 4RQxJG2zPpz4qwkv; Wed, 16 Aug 2023 18:20:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxJG252Bz4Kqv; Wed, 16 Aug 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210014; 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=H27OnfOkcIHKhgkLynVHvdUA+WqGMu5dBLqXdMFnsGM=; b=KpyiCUqyN3RogfvxwEu1twM+hQDs5yjRrU78hOAuvUdnHVPdM6IQaT+4lQ/vsKEtZfT/K8 C+stj5X1iWt/h9aLCOOu9S5A0RzljITT97sV+tr2ov+QkP6KWQCR9sSH9p+pMCuoqynqQN IVAsbcMb1Tmw/bTqRaWqDCTTiwt7lDGfARwM8VwUUEv2kGn/mGuHBvoh2ET2xG8O6OTTgN HGGaeH+8VGuArIcuFkHveBxQ5D+EJi2qxtnYzkhcAh2NbfnKUpfPHjXwAsZA+MeiQnDuwm v8EHSesSMc9X/RBNsKYnHpr8SUyjGUZcRmxIwx+5E6Ih6PHknGMy5xMJagm1gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210014; 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=H27OnfOkcIHKhgkLynVHvdUA+WqGMu5dBLqXdMFnsGM=; b=yHfab9XnWBagVlyBxiYfUjuIzeVZrDMJyGoqzKQvacnQ1JuuDrHHVXB5MVf2GSMPCLiGAu JsRttqJ907BjMa/FwQvKqQy6HeM0VBu+TpKjhhHwdOR1tK2l1D07jJjAn10s30++rAjrNB nELK6ZqJlEP65i8PRw/y/eQovFbEzuERORYUPZdS00z/JbP1O6Nj+lGBqV238K7OELf2KD xfz6n7f9ZjaFE2dtjiw3FWTcv6czhSJj5oHrhjcnxhmN0DcWNAzj/3qiAs2fwnZzSAUyT2 9XB02lMhmfj3KqHLWBqSFyHIUUD2iVOz+DWgPQ9L3cDRbhwCRRL2ezzEoW3qYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210014; a=rsa-sha256; cv=none; b=U+AmkeQyEJyIjr2Ke7TvHUlQJREqy2fJkfythDP6hgqTkDEE+wpss581riVtzIKwOA5g15 TSqTzRlChgC9qRzNhGDGrjYB5WYmIYbP44WyKympXIrPlEW1kawsLCNOvleUcJlPLqx3Wd e9oLAW0QfgxjIusy9Z/eHS/Gk3ez56mugcq/NDZIE8GLVdC555uJ0aEmMRYdBAj5JO4Osz CRKpd4/qNn4Xf5c7jb8Qj1kwPIlh+KEHZXd0fbre/KJU0SqCSU8eLCBpFgQlDBa1cZ6SxY XPEufSqC0R6VGpPskRRDBx+DasMoHA4wqw/FsMoEo3ODv4JgsIWvzku7R5pPdg== 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 4RQxJF4ldsz11rb; Wed, 16 Aug 2023 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIKDrC000998; Wed, 16 Aug 2023 18:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIKDgB000991; Wed, 16 Aug 2023 18:20:13 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:20:13 GMT Message-Id: <202308161820.37GIKDgB000991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c5f49ece16a9 - main - libc: regoranize malloc build 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5f49ece16a92380092191fad13cb1da72af5d37 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c5f49ece16a92380092191fad13cb1da72af5d37 commit c5f49ece16a92380092191fad13cb1da72af5d37 Author: Brooks Davis AuthorDate: 2023-08-16 18:16:51 +0000 Commit: Brooks Davis CommitDate: 2023-08-16 18:16:51 +0000 libc: regoranize malloc build Create a stdlib/malloc to hold the definition of the malloc interface (e.g., the Symbol.map file) and make jemalloc a subdirectory. This will make it easier to integrate alternative allocators such as snmalloc while making it clear that the current jemalloc symbols are the FreeBSD API/ABI (for better or worse). Suggested by: jrtc27 Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41457 --- lib/libc/stdlib/Makefile.inc | 2 +- lib/libc/stdlib/malloc/Makefile.inc | 3 +++ lib/libc/stdlib/{jemalloc => malloc}/Symbol.map | 0 lib/libc/stdlib/{ => malloc}/jemalloc/Makefile.inc | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index caa95bf53951..413c9421c0ee 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -28,7 +28,7 @@ C99_Exit.c: ${LIBC_SRCTOP}/stdlib/_Exit.c .NOMETA SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map -.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" +.include "${LIBC_SRCTOP}/stdlib/malloc/Makefile.inc" # machine-dependent stdlib sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc" diff --git a/lib/libc/stdlib/malloc/Makefile.inc b/lib/libc/stdlib/malloc/Makefile.inc new file mode 100644 index 000000000000..bce4353fe80a --- /dev/null +++ b/lib/libc/stdlib/malloc/Makefile.inc @@ -0,0 +1,3 @@ +SYM_MAPS+=${LIBC_SRCTOP}/stdlib/malloc/Symbol.map + +.include "${LIBC_SRCTOP}/stdlib/malloc/jemalloc/Makefile.inc" diff --git a/lib/libc/stdlib/jemalloc/Symbol.map b/lib/libc/stdlib/malloc/Symbol.map similarity index 100% rename from lib/libc/stdlib/jemalloc/Symbol.map rename to lib/libc/stdlib/malloc/Symbol.map diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc similarity index 96% rename from lib/libc/stdlib/jemalloc/Makefile.inc rename to lib/libc/stdlib/malloc/jemalloc/Makefile.inc index edaa92790c5b..1ba7725fe8a8 100644 --- a/lib/libc/stdlib/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -4,8 +4,6 @@ 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 -SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map - CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include .for src in ${JEMALLOCSRCS}