git: b55f5e1c4ae3 - main - jemalloc: Move generated jemalloc.3 into lib/libc tree
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Dec 2024 23:04:25 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=b55f5e1c4ae375d92dfd597901f238a230e868da
commit b55f5e1c4ae375d92dfd597901f238a230e868da
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-12-13 17:11:51 +0000
Commit: Warner Losh <imp@FreeBSD.org>
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