generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Ferris 2014-10-13 19:48:35 +00:00 committed by Gerrit Code Review
commit 083769a3df
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/upstream-dlmalloc/malloc.c
View File

@ -3526,7 +3526,9 @@ static struct mallinfo internal_mallinfo(mstate m) {
nm.arena = sum; nm.arena = sum;
nm.ordblks = nfree; nm.ordblks = nfree;
nm.hblkhd = m->footprint - sum; 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.uordblks = m->footprint - mfree;
nm.fordblks = mfree; nm.fordblks = mfree;
nm.keepcost = m->topsize; nm.keepcost = m->topsize;