diff options
| author | Christopher Ferris <cferris@google.com> | 2014-10-13 19:36:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-13 19:36:56 +0000 |
| commit | 59a02860a455af68d501ee847889620343dcfb0d (patch) | |
| tree | 686fecf3d2c72e6f9758c5fc95ea637e3c9ffd86 /libc | |
| parent | e0fafb019e33374fae3fa5dc3473e921566b5991 (diff) | |
| parent | f4ada9c9ce31c7e56146a4cb703747385bc043a5 (diff) | |
| download | bionic-59a02860a455af68d501ee847889620343dcfb0d.tar.gz | |
Merge "Return total footprint, not high water mark." into lmp-mr1-dev
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/upstream-dlmalloc/malloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/upstream-dlmalloc/malloc.c b/libc/upstream-dlmalloc/malloc.c index 4362f49ff..3c9d36bf4 100644 --- a/libc/upstream-dlmalloc/malloc.c +++ b/libc/upstream-dlmalloc/malloc.c @@ -3526,7 +3526,9 @@ static struct mallinfo internal_mallinfo(mstate m) { 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; |