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

am 47ed03f7: Merge "Add dlmalloc_usable_size for 32 bit arches." into lmp-dev

Browse Source 
* commit '47ed03f70c6c9addc7f05e4ee4dc71c96d215105':
  Add dlmalloc_usable_size for 32 bit arches.
This commit is contained in:
Christopher Ferris 2014-09-06 20:14:17 +00:00 committed by Android Git Automerger
commit eb1dd673ec
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/bionic/dlmalloc.h
View File

@ -34,6 +34,13 @@
#define malloc_getpagesize getpagesize()
/* dlmalloc_usable_size was exposed in the NDK, so change the name
* of the function on 32 bit architectures.
*/
#if !defined(__LP64__)
#define dlmalloc_usable_size dlmalloc_usable_size_real
#endif
/* Export two symbols used by the VM. */
__BEGIN_DECLS
int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;

7
libc/bionic/ndk_cruft.cpp
View File

@ -308,4 +308,11 @@ extern "C" void arc4random_stir(void) {
// The current implementation stirs itself as needed.
}
// Old versions of the NDK did not export malloc_usable_size, but did
// export dlmalloc_usable_size. We are moving away from dlmalloc in L
// so make this call malloc_usable_size.
extern "C" size_t dlmalloc_usable_size(void* ptr) {
return malloc_usable_size(ptr);
}
#endif