commit 083769a3dffabfb968a03a700b9f2fd7838bcf75
author Christopher Ferris <cferris@google.com> Mon Oct 13 19:48:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 13 19:48:35 2014 +0000
tree 3222d98e7842d30b2da29774e2ceeca943d70a67
parent 94571f9ade03cfe24bff1bddc4d6c1a320b39b8e
parent fee09e556f3414bc1027809477c0019084cc01c1

Merge "Return total footprint, not high water mark."

libc/upstream-dlmalloc/malloc.c

diff --git a/libc/upstream-dlmalloc/malloc.c b/libc/upstream-dlmalloc/malloc.c
index 4362f49..3c9d36b 100644
--- a/libc/upstream-dlmalloc/malloc.c
+++ b/libc/upstream-dlmalloc/malloc.c
@@ -3526,7 +3526,9 @@
       nm.arena    = sum;
       nm.ordblks  = nfree;
       nm.hblkhd   = m->footprint - sum;
-      nm.usmblks  = m->max_footprint;
+      /* BEGIN android-changed: usmblks set to footprint from max_footprint */
+      nm.usmblks  = m->footprint;
+      /* END android-changed */
       nm.uordblks = m->footprint - mfree;
       nm.fordblks = mfree;
       nm.keepcost = m->topsize;