diff options
author | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
---|---|---|
committer | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
commit | 46c0af68bd248b04df75e4f92d5fb804c3d75340 (patch) | |
tree | 28a1ac21474d5f3d55812986c4c75a8bb734257b /include/jemalloc/internal/huge.h | |
parent | 7709a64c59daf0b1f938be49472fcc499e1bd136 (diff) | |
parent | 8a26eaca7f4c95771ecbf096caeeba14fbe1122f (diff) | |
download | jemalloc-3.6.0.zip jemalloc-3.6.0.tar.gz jemalloc-3.6.0.tar.bz2 |
Merge branch 'dev'3.6.0
Diffstat (limited to 'include/jemalloc/internal/huge.h')
-rw-r--r-- | include/jemalloc/internal/huge.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/jemalloc/internal/huge.h b/include/jemalloc/internal/huge.h index ddf1313..a2b9c77 100644 --- a/include/jemalloc/internal/huge.h +++ b/include/jemalloc/internal/huge.h @@ -17,18 +17,20 @@ extern size_t huge_allocated; /* Protects chunk-related data structures. */ 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_malloc(size_t size, bool zero, dss_prec_t dss_prec); +void *huge_palloc(size_t size, size_t alignment, bool zero, + dss_prec_t dss_prec); 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); + size_t alignment, bool zero, bool try_tcache_dalloc, dss_prec_t dss_prec); #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); +dss_prec_t huge_dss_prec_get(arena_t *arena); prof_ctx_t *huge_prof_ctx_get(const void *ptr); void huge_prof_ctx_set(const void *ptr, prof_ctx_t *ctx); bool huge_boot(void); |