From 65221c72be1ddbfce1a59d3179656c3e059b79e8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 4 Jan 2013 14:22:53 -0800 Subject: [PATCH] libc - Revert to nmalloc for now * Disable dmalloc on 64-bit systems, use nmalloc for everything for now. dmalloc appears to have some severe fragmentation and/or leak issues in long running programs (aka xulrunner) which are worse than nmalloc. --- lib/libc/stdlib/Makefile.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 3752d238c7..6e56523e80 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -15,11 +15,15 @@ MISRCS+=a64l.c abort.c abs.c atexit.c aligned_alloc.c \ strtol.c strtoll.c strtonum.c strtoq.c strtoul.c strtoull.c \ strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c -.if ${MACHINE_ARCH} == "x86_64" -MISRCS+= dmalloc.c -.else +# dmalloc has a leak somewhere and is eating up too much +# memory in long-running programs, and also doesn't do cache +# coloring for large allocations. Use nmalloc for now. +# +#.if ${MACHINE_ARCH} == "x86_64" +#MISRCS+= dmalloc.c +#.else MISRCS+= nmalloc.c -.endif +#.endif # machine-dependent stdlib sources .if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc) -- 2.41.0