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

Do not include libc_common in malloc debug code.

Browse Source 
The inclusion of the static libc_common library in the malloc_debug_XXX.so
shared libraries causes constructors to be called twice. This doesn't seem
to have caused any issues when setting the libc.debug.malloc property.
However, jemalloc crashes because there are two jemalloc implementations,
one in the static libc_common library and one in the shared library. Each
implementation has created overlapping thread keys that are not the same.
The crash comes because one of the jemalloc keys is actually used by the
locale setting code. Thus if someone sets the locale, the jemalloc code
crashes trying to access the same key.

Change-Id: Iaac650a82d69064db148a6333e9403744f68b4a4
This commit is contained in:
Christopher Ferris
2014-07-09 17:16:07 -07:00
parent 4c199170a8
commit dda1c6c466
6 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libc/bionic/malloc_debug_common.h
View File

@@ -51,17 +51,6 @@
#define MALLOC_ALIGNMENT ((size_t)(2 * sizeof(void *)))
#endif
#ifdef USE_JEMALLOC
#include "jemalloc.h"
#define Malloc(function) je_ ## function
#else
#ifndef USE_DLMALLOC
#error "Either one of USE_DLMALLOC or USE_JEMALLOC must be defined."
#endif
#include "dlmalloc.h"
#define Malloc(function) dl ## function
#endif
// =============================================================================
// Structures
// =============================================================================
@@ -116,7 +105,7 @@ struct MallocDebug {
#endif
};
typedef bool (*MallocDebugInit)(HashTable*);
typedef bool (*MallocDebugInit)(HashTable*, const MallocDebug*);
typedef void (*MallocDebugFini)(int);
// =============================================================================