diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-04 23:11:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-04 23:11:06 +0000 |
| commit | 37229f2a9271b6e0d0d1ec516421018b807f00e8 (patch) | |
| tree | ae5f4d62725ee921e1e0b00a5770111371792243 | |
| parent | 53e3bbab07f8d410418f87007177d5ad81e38bcf (diff) | |
| parent | 6403cc48707b67b3400bdaf720f3e4777a1b48de (diff) | |
| download | bionic-37229f2a9271b6e0d0d1ec516421018b807f00e8.zip bionic-37229f2a9271b6e0d0d1ec516421018b807f00e8.tar.gz bionic-37229f2a9271b6e0d0d1ec516421018b807f00e8.tar.bz2 | |
Merge "Temporarily expose dlmalloc_usable_size."
| -rw-r--r-- | libc/bionic/dlmalloc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libc/bionic/dlmalloc.h b/libc/bionic/dlmalloc.h index e065687..482fe0e 100644 --- a/libc/bionic/dlmalloc.h +++ b/libc/bionic/dlmalloc.h @@ -32,10 +32,15 @@ #define USE_SPIN_LOCKS 0 #define DEFAULT_MMAP_THRESHOLD (64U * 1024U) -/* Export two symbols used by the VM. */ __BEGIN_DECLS + +/* Export two symbols used by the VM. */ int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__; void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__; + +/* NVIDIA's libglcore.so has a reference to dlmalloc_usable_size. TODO: remove this. */ +size_t dlmalloc_usable_size(const void*) __LIBC_ABI_PUBLIC__; + __END_DECLS /* Include the proper definitions. */ |