am 083769a3: Merge "Return total footprint, not high water mark."

* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
  Return total footprint, not high water mark.
This commit is contained in:
Christopher Ferris 2014-10-13 22:10:03 +00:00 committed by Android Git Automerger
commit 737b6581c2

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;