libc - Revert to nmalloc for now
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 4 Jan 2013 22:22:53 +0000 (14:22 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 4 Jan 2013 22:22:53 +0000 (14:22 -0800)
* 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

index 3752d23..6e56523 100644 (file)
@@ -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)