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

Add new header to support 32 bit/64 bit dumps.

Browse Source 
Bug: 17319589

(cherry picked from commit 0d3c045a0d48193150689e5924bd04c511380a8a)

Change-Id: I79aa035098115de7b02171a9432ff7e9393328ab
This commit is contained in:
Christopher Ferris
2014-09-02 12:49:32 -07:00
parent 523afd157b
commit bebb26725a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_ddm_DdmHandleNativeHeap.cpp
View File

@@ -35,7 +35,15 @@ extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize,
extern "C" void free_malloc_leak_info(uint8_t* info);
#define DDMS_HEADER_SIGNATURE 0x812345dd
#define DDMS_VERSION 2
struct Header {
#if defined(__LP64__)
uint32_t signature;
uint16_t version;
uint16_t pointerSize;
#endif
size_t mapSize;
size_t allocSize;
size_t allocInfoSize;
@@ -77,6 +85,12 @@ static jbyteArray DdmHandleNativeHeap_getLeakInfo(JNIEnv* env, jobject) {
ALOGD("*** mapSize: %d allocSize: %d allocInfoSize: %d totalMemory: %d",
header.mapSize, header.allocSize, header.allocInfoSize, header.totalMemory);
#if defined(__LP64__)
header.signature = DDMS_HEADER_SIGNATURE;
header.version = DDMS_VERSION;
header.pointerSize = sizeof(void*);
#endif
jbyteArray array = env->NewByteArray(sizeof(Header) + header.mapSize + header.allocSize);
if (array != NULL) {
env->SetByteArrayRegion(array, 0,