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

* commit '93e474ef5485c0628c358351d3cc6e4938294beb':
  Return total footprint, not high water mark.
This commit is contained in:
Christopher Ferris 2014-10-13 19:46:50 +00:00 committed by Android Git Automerger
commit 3928d3e2d6

View File

@ -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;