diff options
author | Jason Evans <jasone@canonware.com> | 2014-01-22 11:11:22 -0800 |
---|---|---|
committer | Jason Evans <jasone@canonware.com> | 2014-01-22 11:11:22 -0800 |
commit | cc47dde16203a6ae7eb685b53e1ae501f3869bc6 (patch) | |
tree | 74e81d65651b2ca7e294a857797dda6635177454 /include/jemalloc/internal/huge.h | |
parent | 0135fb806e4137dc9cdf152541926a2bc95e33f0 (diff) | |
parent | 798a48103014aabf8afb3d7efff90399a466dd8c (diff) | |
download | jemalloc-3.5.0.tar.gz |
Merge branch 'dev'3.5.0
Diffstat (limited to 'include/jemalloc/internal/huge.h')
-rw-r--r-- | include/jemalloc/internal/huge.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/jemalloc/internal/huge.h b/include/jemalloc/internal/huge.h index d987d370..ddf13138 100644 --- a/include/jemalloc/internal/huge.h +++ b/include/jemalloc/internal/huge.h @@ -19,10 +19,14 @@ extern malloc_mutex_t huge_mtx; void *huge_malloc(size_t size, bool zero); void *huge_palloc(size_t size, size_t alignment, bool zero); -void *huge_ralloc_no_move(void *ptr, size_t oldsize, size_t size, +bool huge_ralloc_no_move(void *ptr, size_t oldsize, size_t size, size_t extra); void *huge_ralloc(void *ptr, size_t oldsize, size_t size, size_t extra, size_t alignment, bool zero, bool try_tcache_dalloc); +#ifdef JEMALLOC_JET +typedef void (huge_dalloc_junk_t)(void *, size_t); +extern huge_dalloc_junk_t *huge_dalloc_junk; +#endif void huge_dalloc(void *ptr, bool unmap); size_t huge_salloc(const void *ptr); prof_ctx_t *huge_prof_ctx_get(const void *ptr); |