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

Return total footprint, not high water mark.

Browse Source 
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.

Bug: 17265653

(cherry pick from commit f4ada9c9ce31c7e56146a4cb703747385bc043a5)

Change-Id: I2fba10285859dccfe8331063c9be14cc169f2d91
This commit is contained in:
Christopher Ferris 2014-10-10 08:40:21 -07:00
parent 94571f9ade
commit fee09e556f
1 changed files with 3 additions and 1 deletions

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