Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix code for new malloc debug enable."

Browse Source 
am: 1efb3e93e6

Change-Id: Ifbab90962878670fdacfc7b308afa46dce898f6d
This commit is contained in:
Christopher Ferris
2016-09-30 01:09:43 +00:00
committed by android-build-merger
parent 53704b3138 1efb3e93e6
commit b66b1d26b3
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/jni/android_os_Debug.cpp
View File

@@ -839,7 +839,8 @@ extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize,
size_t* infoSize, size_t* totalMemory, size_t* backtraceSize); size_t* infoSize, size_t* totalMemory, size_t* backtraceSize);
extern "C" void free_malloc_leak_info(uint8_t* info); extern "C" void free_malloc_leak_info(uint8_t* info);
#define SIZE_FLAG_ZYGOTE_CHILD (1<<31) #define SIZE_FLAG_ZYGOTE_CHILD (1<<31)
#define BACKTRACE_SIZE 32
static size_t gNumBacktraceElements;
/* /*
* This is a qsort() callback. * This is a qsort() callback.
@@ -859,11 +860,11 @@ static int compareHeapRecords(const void* vrec1, const void* vrec2)
return -1; return -1;
} }
intptr_t* bt1 = (intptr_t*)(rec1 + 2); uintptr_t* bt1 = (uintptr_t*)(rec1 + 2);
intptr_t* bt2 = (intptr_t*)(rec2 + 2); uintptr_t* bt2 = (uintptr_t*)(rec2 + 2);
for (size_t idx = 0; idx < BACKTRACE_SIZE; idx++) { for (size_t idx = 0; idx < gNumBacktraceElements; idx++) {
intptr_t addr1 = bt1[idx]; uintptr_t addr1 = bt1[idx];
intptr_t addr2 = bt2[idx]; uintptr_t addr2 = bt2[idx];
if (addr1 == addr2) { if (addr1 == addr2) {
if (addr1 == 0) if (addr1 == 0)
break; break;
@@ -907,9 +908,10 @@ static void dumpNativeHeap(FILE* fp)
if (info == NULL) { if (info == NULL) {
fprintf(fp, "Native heap dump not available. To enable, run these" fprintf(fp, "Native heap dump not available. To enable, run these"
" commands (requires root):\n"); " commands (requires root):\n");
fprintf(fp, "$ adb shell setprop libc.debug.malloc 1\n"); fprintf(fp, "# adb shell stop\n");
fprintf(fp, "$ adb shell stop\n"); fprintf(fp, "# adb shell setprop libc.debug.malloc.options "
fprintf(fp, "$ adb shell start\n"); "backtrace\n");
fprintf(fp, "# adb shell start\n");
return; return;
} }
assert(infoSize != 0); assert(infoSize != 0);
@@ -920,13 +922,11 @@ static void dumpNativeHeap(FILE* fp)
size_t recordCount = overallSize / infoSize; size_t recordCount = overallSize / infoSize;
fprintf(fp, "Total memory: %zu\n", totalMemory); fprintf(fp, "Total memory: %zu\n", totalMemory);
fprintf(fp, "Allocation records: %zd\n", recordCount); fprintf(fp, "Allocation records: %zd\n", recordCount);
if (backtraceSize != BACKTRACE_SIZE) { fprintf(fp, "Backtrace size: %zd\n", backtraceSize);
fprintf(fp, "WARNING: mismatched backtrace sizes (%zu vs. %d)\n",
backtraceSize, BACKTRACE_SIZE);
}
fprintf(fp, "\n"); fprintf(fp, "\n");
/* re-sort the entries */ /* re-sort the entries */
gNumBacktraceElements = backtraceSize;
qsort(info, recordCount, infoSize, compareHeapRecords); qsort(info, recordCount, infoSize, compareHeapRecords);
/* dump the entries to the file */ /* dump the entries to the file */
@@ -934,7 +934,7 @@ static void dumpNativeHeap(FILE* fp)
for (size_t idx = 0; idx < recordCount; idx++) { for (size_t idx = 0; idx < recordCount; idx++) {
size_t size = *(size_t*) ptr; size_t size = *(size_t*) ptr;
size_t allocations = *(size_t*) (ptr + sizeof(size_t)); size_t allocations = *(size_t*) (ptr + sizeof(size_t));
intptr_t* backtrace = (intptr_t*) (ptr + sizeof(size_t) * 2); uintptr_t* backtrace = (uintptr_t*) (ptr + sizeof(size_t) * 2);
fprintf(fp, "z %d sz %8zu num %4zu bt", fprintf(fp, "z %d sz %8zu num %4zu bt",
(size & SIZE_FLAG_ZYGOTE_CHILD) != 0, (size & SIZE_FLAG_ZYGOTE_CHILD) != 0,