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

am f8cb4542: am 30f89b6f: am aafa3d0e: Merge "Hide various debug malloc implementation details."

Browse Source 
* commit 'f8cb45429b2cd4df8908f998fdc72b0fa235474a':
  Hide various debug malloc implementation details.
This commit is contained in:
Elliott Hughes 2014-05-16 23:15:33 +00:00 committed by Android Git Automerger
commit 7c8d98db59
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/bionic/malloc_debug_common.cpp
View File

@ -54,8 +54,8 @@
*/ */
int gMallocLeakZygoteChild = 0; int gMallocLeakZygoteChild = 0;
pthread_mutex_t g_allocations_mutex = PTHREAD_MUTEX_INITIALIZER; __LIBC_HIDDEN__ pthread_mutex_t g_allocations_mutex = PTHREAD_MUTEX_INITIALIZER;
HashTable g_hash_table; __LIBC_HIDDEN__ HashTable g_hash_table;
// ============================================================================= // =============================================================================
// output functions // output functions
@ -113,7 +113,7 @@ static int hash_entry_compare(const void* arg1, const void* arg2) {
* not include heap overhead * not include heap overhead
* "*backtraceSize" is set to the maximum number of entries in the back trace * "*backtraceSize" is set to the maximum number of entries in the back trace
*/ */
extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize, extern "C" __LIBC_HIDDEN__ 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) {
// don't do anything if we have invalid arguments // don't do anything if we have invalid arguments
if (info == NULL || overallSize == NULL || infoSize == NULL || if (info == NULL || overallSize == NULL || infoSize == NULL ||
@ -182,7 +182,7 @@ extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize,
dlfree(list); dlfree(list);
} }
extern "C" void free_malloc_leak_info(uint8_t* info) { extern "C" __LIBC_HIDDEN__ void free_malloc_leak_info(uint8_t* info) {
dlfree(info); dlfree(info);
} }
@ -286,11 +286,11 @@ static void* libc_malloc_impl_handle = NULL;
* backlog we use to detect multiple frees. If the property is not set, the * backlog we use to detect multiple frees. If the property is not set, the
* backlog length defaults to BACKLOG_DEFAULT_LEN. * backlog length defaults to BACKLOG_DEFAULT_LEN.
*/ */
unsigned int g_malloc_debug_backlog; __LIBC_HIDDEN__ unsigned int g_malloc_debug_backlog;
#define BACKLOG_DEFAULT_LEN 100 #define BACKLOG_DEFAULT_LEN 100
/* The value of libc.debug.malloc. */ /* The value of libc.debug.malloc. */
int g_malloc_debug_level; __LIBC_HIDDEN__ int g_malloc_debug_level;
template<typename FunctionType> template<typename FunctionType>
static void InitMallocFunction(void* malloc_impl_handler, FunctionType* func, const char* prefix, const char* suffix) { static void InitMallocFunction(void* malloc_impl_handler, FunctionType* func, const char* prefix, const char* suffix) {