On 7/20/25 23:02, Mark Millard wrote:
Something I ran into (I did not look at older history
but older releng/14.* may have the same issue):
stable/13/ and releng/13.5/ have (via kevans@):
diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
index dfda508ea1e1..6ff0ce18d5da 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -5,7 +5,7 @@
#undef JEMALLOC_OVERRIDE_VALLOC
#ifndef MALLOC_PRODUCTION
-#define MALLOC_PRODUCTION
+#define JEMALLOC_DEBUG
#endif
#undef JEMALLOC_DSS
13.5-STABLE's man src.conf indicates to change things via use
of WITHOUT_MALLOC_PRODUCTION, as does 13.5-RELEASE's.
Right, my recollection is that I reverted gjb's change (after
discussion) because we had setup the knob specifically to avoid having
to touch this, but re's checklist just hadn't been updated yet.
stable/14 and releng/14.3/ have (via gjb@):
diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
index 00848c0c48e3..ea8e8d42b14e 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -5,7 +5,7 @@
#undef JEMALLOC_OVERRIDE_VALLOC
#ifndef MALLOC_PRODUCTION
-#define JEMALLOC_DEBUG
+#define MALLOC_PRODUCTION
#endif
#undef JEMALLOC_DSS
14.3-STABLE's man src.conf indicates to change things via use
of WITH_MALLOC_PRODUCTION, as does 14.3-RELEASE's. But the
above for 14.3 would seem to force MALLOC_PRODUCTION and make
JEMALLOC_DEBUG unavailable.
I thought the checklist was up-to-date by then, but I guess not. CC'ing
re@, just in case; they don't need to touch the file again when
stable/15 branches. We have a proper knob for this, and the only
relevant change should be to flip the default as needed for the build in
share/mk/src.opts.mk.
(Also noted on discord where I was doing something
when I discovered this.)
===
Mark Millard
marklmi at yahoo.com
