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

am 59a02860: Merge "Return total footprint, not high water mark." into lmp-mr1-dev

Browse Source 
* commit '59a02860a455af68d501ee847889620343dcfb0d':
  Return total footprint, not high water mark.
This commit is contained in:
Christopher Ferris 2014-10-13 19:44:19 +00:00 committed by Android Git Automerger
commit 93e474ef54
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;