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

Merge "Hide dlmalloc symbols."

Browse Source
This commit is contained in:
Elliott Hughes 2014-06-04 03:30:36 +00:00 committed by Gerrit Code Review
commit 38ed337c13
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libc/Android.mk
View File

@ -500,11 +500,9 @@ endif
ifeq ($(MALLOC_IMPL),jemalloc) ifeq ($(MALLOC_IMPL),jemalloc)
libc_common_cflags += -DUSE_JEMALLOC libc_common_cflags += -DUSE_JEMALLOC
libc_malloc_src := bionic/jemalloc.cpp libc_malloc_src := bionic/jemalloc.cpp
else else
libc_common_cflags += -DUSE_DLMALLOC libc_common_cflags += -DUSE_DLMALLOC
libc_malloc_src := bionic/dlmalloc.c libc_malloc_src := bionic/dlmalloc.c
endif endif
@ -821,6 +819,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libc_dns \ libc_dns \
libc_freebsd \ libc_freebsd \
libc_gdtoa \ libc_gdtoa \
libc_malloc \
libc_netbsd \ libc_netbsd \
libc_openbsd \ libc_openbsd \
libc_stack_protector \ libc_stack_protector \
@ -828,8 +827,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libc_tzcode \ libc_tzcode \
ifeq ($(MALLOC_IMPL),jemalloc) ifeq ($(MALLOC_IMPL),jemalloc)
LOCAL_WHOLE_STATIC_LIBRARIES += \ LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc
libjemalloc
endif endif
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
@ -878,6 +876,24 @@ $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_static_src_
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# ========================================================
# libc_malloc.a: the _prefixed_ malloc functions (like dlcalloc).
# ========================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_malloc_src)
LOCAL_CFLAGS := $(libc_common_cflags) \
-Werror \
-fvisibility=hidden \
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_malloc
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
include $(BUILD_STATIC_LIBRARY)
# ======================================================== # ========================================================
# libc.a # libc.a
# ======================================================== # ========================================================
@ -886,7 +902,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(libc_arch_static_src_files) \ $(libc_arch_static_src_files) \
$(libc_static_common_src_files) \ $(libc_static_common_src_files) \
$(libc_malloc_src) \
bionic/malloc_debug_common.cpp \ bionic/malloc_debug_common.cpp \
bionic/libc_init_static.cpp \ bionic/libc_init_static.cpp \
@ -919,7 +934,6 @@ LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(libc_arch_dynamic_src_files) \ $(libc_arch_dynamic_src_files) \
$(libc_static_common_src_files) \ $(libc_static_common_src_files) \
$(libc_malloc_src) \
bionic/malloc_debug_common.cpp \ bionic/malloc_debug_common.cpp \
bionic/debug_mapinfo.cpp \ bionic/debug_mapinfo.cpp \
bionic/debug_stacktrace.cpp \ bionic/debug_stacktrace.cpp \

17
libc/bionic/dlmalloc.c
View File

@ -46,14 +46,11 @@ static void __bionic_heap_usage_error(const char* function, void* address) {
*((int**) 0xdeadbaad) = (int*) address; *((int**) 0xdeadbaad) = (int*) address;
} }
static void* named_anonymous_mmap(size_t length) static void* named_anonymous_mmap(size_t length) {
{ void* map = mmap(NULL, length, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
void* ret; if (map == MAP_FAILED) {
ret = mmap(NULL, length, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); return map;
if (ret == MAP_FAILED) }
return ret; __bionic_name_mem(map, length, "libc_malloc");
return map;
__bionic_name_mem(ret, length, "libc_malloc");
return ret;
} }

9
libc/bionic/dlmalloc.h
View File

@ -17,6 +17,9 @@
#ifndef LIBC_BIONIC_DLMALLOC_H_ #ifndef LIBC_BIONIC_DLMALLOC_H_
#define LIBC_BIONIC_DLMALLOC_H_ #define LIBC_BIONIC_DLMALLOC_H_
#include <sys/cdefs.h>
#include <stddef.h>
/* Configure dlmalloc. */ /* Configure dlmalloc. */
#define HAVE_GETPAGESIZE 1 #define HAVE_GETPAGESIZE 1
#define MALLOC_INSPECT_ALL 1 #define MALLOC_INSPECT_ALL 1
@ -29,6 +32,12 @@
#define USE_SPIN_LOCKS 0 #define USE_SPIN_LOCKS 0
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U) #define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
/* Export two symbols used by the VM. */
__BEGIN_DECLS
int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;
void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__;
__END_DECLS
/* Include the proper definitions. */ /* Include the proper definitions. */
#include "../upstream-dlmalloc/malloc.h" #include "../upstream-dlmalloc/malloc.h"