diff options
author | Andreas Huber <andih@google.com> | 2009-10-27 15:50:04 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-10-27 15:50:04 -0700 |
commit | 1eea7f529c1c25901a7749fed4792ed68379d841 (patch) | |
tree | e010c6f1f8924f81a91408139a32aff4ff41c970 /media/libmediaplayerservice/MediaPlayerService.cpp | |
parent | d6703ab22c85b43fdb2deb78a37e51465c902a5f (diff) | |
download | frameworks_av-1eea7f529c1c25901a7749fed4792ed68379d841.zip frameworks_av-1eea7f529c1c25901a7749fed4792ed68379d841.tar.gz frameworks_av-1eea7f529c1c25901a7749fed4792ed68379d841.tar.bz2 |
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index ab759df..64267de 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -356,11 +356,44 @@ extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize, size_t* infoSize, size_t* totalMemory, size_t* backtraceSize); extern "C" void free_malloc_leak_info(uint8_t* info); +// Use the String-class below instead of String8 to allocate all memory +// beforehand and not reenter the heap while we are examining it... +struct MyString8 { + static const size_t MAX_SIZE = 256 * 1024; + + MyString8() + : mPtr((char *)malloc(MAX_SIZE)) { + *mPtr = '\0'; + } + + ~MyString8() { + free(mPtr); + } + + void append(const char *s) { + strcat(mPtr, s); + } + + const char *string() const { + return mPtr; + } + + size_t size() const { + return strlen(mPtr); + } + +private: + char *mPtr; + + MyString8(const MyString8 &); + MyString8 &operator=(const MyString8 &); +}; + void memStatus(int fd, const Vector<String16>& args) { const size_t SIZE = 256; char buffer[SIZE]; - String8 result; + MyString8 result; typedef struct { size_t size; |