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

Remove non-standard prctl constants from <sys/prctl.h>.

Browse Source 
Also remove __bionic_name_mem which has exactly one caller, and is only
ever expected to be used in this one place.

Change-Id: I833744f91e887639f5b2d1269f966ee9032af207
This commit is contained in:
Elliott Hughes
2014-07-17 14:26:33 -07:00
parent 43363ab720
commit d7453860a6
5 changed files with 7 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/dlmalloc.c
View File

@@ -26,11 +26,16 @@ static void __bionic_heap_usage_error(const char* function, void* address);
#define CORRUPTION_ERROR_ACTION(m) __bionic_heap_corruption_error(__FUNCTION__)
#define USAGE_ERROR_ACTION(m,p) __bionic_heap_usage_error(__FUNCTION__, p)
/* Bionic named anonymous memory declarations */
// Bionic named anonymous memory declarations.
static void* named_anonymous_mmap(size_t length);
#define MMAP(s) named_anonymous_mmap(s)
#define DIRECT_MMAP(s) named_anonymous_mmap(s)
// Local definitions of custom prctl arguments to set a vma name in Android kernels.
#include <sys/prctl.h>
#define PR_SET_VMA 0x53564d41
#define PR_SET_VMA_ANON_NAME 0
// Ugly inclusion of C file so that bionic specific #defines configure dlmalloc.
#include "../upstream-dlmalloc/malloc.c"
@@ -51,6 +56,6 @@ static void* named_anonymous_mmap(size_t length) {
if (map == MAP_FAILED) {
return map;
}
__bionic_name_mem(map, length, "libc_malloc");
prctl(BIONIC_PR_SET_VMA, BIONIC_PR_SET_VMA_ANON_NAME, map, length, "libc_malloc");
return map;
}