summaryrefslogtreecommitdiffstats
path: root/include/jemalloc/internal/huge.h
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2015-09-15 22:55:37 (GMT)
committerJason Evans <jasone@canonware.com>2015-09-15 22:55:37 (GMT)
commit9898051fd16ebd5d29dc27aae5e069fe04486ff3 (patch)
treeadeab60b769c0dffa0782bd46eb60e741b4a2ff9 /include/jemalloc/internal/huge.h
parent6e98caf8f064482b9ab292ef3638dea67420bbc2 (diff)
parent1d7540c9d71ee8a85ea97c9459698e090ee04719 (diff)
downloadjemalloc-4.0.1.zip
jemalloc-4.0.1.tar.gz
jemalloc-4.0.1.tar.bz2
Merge branch 'dev'4.0.1
Diffstat (limited to 'include/jemalloc/internal/huge.h')
-rw-r--r--include/jemalloc/internal/huge.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/jemalloc/internal/huge.h b/include/jemalloc/internal/huge.h
index 8b6c6ce..ece7af9 100644
--- a/include/jemalloc/internal/huge.h
+++ b/include/jemalloc/internal/huge.h
@@ -13,11 +13,10 @@ void *huge_malloc(tsd_t *tsd, arena_t *arena, size_t size, bool zero,
tcache_t *tcache);
void *huge_palloc(tsd_t *tsd, arena_t *arena, size_t size, size_t alignment,
bool zero, tcache_t *tcache);
-bool huge_ralloc_no_move(void *ptr, size_t oldsize, size_t size,
- size_t extra, bool zero);
+bool huge_ralloc_no_move(void *ptr, size_t oldsize, size_t usize_min,
+ size_t usize_max, bool zero);
void *huge_ralloc(tsd_t *tsd, arena_t *arena, void *ptr, size_t oldsize,
- size_t size, size_t extra, size_t alignment, bool zero,
- tcache_t *tcache);
+ size_t usize, size_t alignment, bool zero, tcache_t *tcache);
#ifdef JEMALLOC_JET
typedef void (huge_dalloc_junk_t)(void *, size_t);
extern huge_dalloc_junk_t *huge_dalloc_junk;
@@ -27,6 +26,7 @@ arena_t *huge_aalloc(const void *ptr);
size_t huge_salloc(const void *ptr);
prof_tctx_t *huge_prof_tctx_get(const void *ptr);
void huge_prof_tctx_set(const void *ptr, prof_tctx_t *tctx);
+void huge_prof_tctx_reset(const void *ptr);
#endif /* JEMALLOC_H_EXTERNS */
/******************************************************************************/