diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-08-11 18:56:41 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2009-08-11 18:56:41 -0700 |
commit | e868513287c50caec4bcc83be3c49e12dfbeac72 (patch) | |
tree | 6d718266a3587e3ce5f99cf717edb0e02eccd003 /libs/utils | |
parent | 7e78445103b25c05b49d22ecfeb2704215f41010 (diff) | |
download | frameworks_native-e868513287c50caec4bcc83be3c49e12dfbeac72.zip frameworks_native-e868513287c50caec4bcc83be3c49e12dfbeac72.tar.gz frameworks_native-e868513287c50caec4bcc83be3c49e12dfbeac72.tar.bz2 |
Fix issue #2048263: More debugging information
We now hopefully do better about generating the anr reports, and include
information about the malloc loaded assets in meminfo.
Diffstat (limited to 'libs/utils')
-rw-r--r-- | libs/utils/Asset.cpp | 58 |
1 files changed, 53 insertions, 5 deletions
diff --git a/libs/utils/Asset.cpp b/libs/utils/Asset.cpp index 23cb72d..4295123 100644 --- a/libs/utils/Asset.cpp +++ b/libs/utils/Asset.cpp @@ -27,6 +27,7 @@ #include <utils/ZipUtils.h> #include <utils/ZipFileRO.h> #include <utils/Log.h> +#include <utils/threads.h> #include <string.h> #include <memory.h> @@ -40,24 +41,71 @@ using namespace android; # define O_BINARY 0 #endif -static volatile int32_t gCount = 0; +static Mutex gAssetLock; +static int32_t gCount = 0; +static Asset* gHead = NULL; +static Asset* gTail = NULL; int32_t Asset::getGlobalCount() { + AutoMutex _l(gAssetLock); return gCount; } +String8 Asset::getAssetAllocations() +{ + AutoMutex _l(gAssetLock); + String8 res; + Asset* cur = gHead; + while (cur != NULL) { + if (cur->isAllocated()) { + res.append(" "); + res.append(cur->getAssetSource()); + off_t size = (cur->getLength()+512)/1024; + char buf[64]; + sprintf(buf, ": %dK\n", (int)size); + res.append(buf); + } + cur = cur->mNext; + } + + return res; +} + Asset::Asset(void) : mAccessMode(ACCESS_UNKNOWN) { - int count = android_atomic_inc(&gCount)+1; - //LOGI("Creating Asset %p #%d\n", this, count); + AutoMutex _l(gAssetLock); + gCount++; + mNext = mPrev = NULL; + if (gTail == NULL) { + gHead = gTail = this; + } else { + mPrev = gTail; + gTail->mNext = this; + gTail = this; + } + //LOGI("Creating Asset %p #%d\n", this, gCount); } Asset::~Asset(void) { - int count = android_atomic_dec(&gCount); - //LOGI("Destroying Asset in %p #%d\n", this, count); + AutoMutex _l(gAssetLock); + gCount--; + if (gHead == this) { + gHead = mNext; + } + if (gTail == this) { + gTail = mPrev; + } + if (mNext != NULL) { + mNext->mPrev = mPrev; + } + if (mPrev != NULL) { + mPrev->mNext = mNext; + } + mNext = mPrev = NULL; + //LOGI("Destroying Asset in %p #%d\n", this, gCount); } /* |