diff options
| author | Jason Evans <je@fb.com> | 2010-12-04 01:05:01 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2010-12-04 01:05:01 (GMT) |
| commit | 1c4b088b08d3bc7617a34387e196ce03716160bf (patch) | |
| tree | ff0edcf0e21d136ddf6ffda51b1a205d9f12e646 /jemalloc/include | |
| parent | 0a36622dd1e2e7da0b833e161ec79398bc30cd5b (diff) | |
| parent | 0e8d3d2cb9b3c9048b43588271a1e3a837ab186e (diff) | |
| download | jemalloc-2.1.0.zip jemalloc-2.1.0.tar.gz jemalloc-2.1.0.tar.bz2 | |
Merge branch 'dev'2.1.0
Diffstat (limited to 'jemalloc/include')
| -rw-r--r-- | jemalloc/include/jemalloc/internal/chunk_dss.h | 1 | ||||
| -rw-r--r-- | jemalloc/include/jemalloc/internal/chunk_swap.h | 1 | ||||
| -rw-r--r-- | jemalloc/include/jemalloc/internal/huge.h | 2 | ||||
| -rw-r--r-- | jemalloc/include/jemalloc/internal/jemalloc_internal.h.in | 2 | ||||
| -rw-r--r-- | jemalloc/include/jemalloc/jemalloc_defs.h.in | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/jemalloc/include/jemalloc/internal/chunk_dss.h b/jemalloc/include/jemalloc/internal/chunk_dss.h index 6be4ad1..6f00522 100644 --- a/jemalloc/include/jemalloc/internal/chunk_dss.h +++ b/jemalloc/include/jemalloc/internal/chunk_dss.h @@ -17,6 +17,7 @@ extern malloc_mutex_t dss_mtx; void *chunk_alloc_dss(size_t size, bool *zero); +bool chunk_in_dss(void *chunk); bool chunk_dealloc_dss(void *chunk, size_t size); bool chunk_dss_boot(void); diff --git a/jemalloc/include/jemalloc/internal/chunk_swap.h b/jemalloc/include/jemalloc/internal/chunk_swap.h index d50cb19..9faa739 100644 --- a/jemalloc/include/jemalloc/internal/chunk_swap.h +++ b/jemalloc/include/jemalloc/internal/chunk_swap.h @@ -20,6 +20,7 @@ extern size_t swap_avail; #endif void *chunk_alloc_swap(size_t size, bool *zero); +bool chunk_in_swap(void *chunk); bool chunk_dealloc_swap(void *chunk, size_t size); bool chunk_swap_enable(const int *fds, unsigned nfds, bool prezeroed); bool chunk_swap_boot(void); diff --git a/jemalloc/include/jemalloc/internal/huge.h b/jemalloc/include/jemalloc/internal/huge.h index bf23127..66544cf 100644 --- a/jemalloc/include/jemalloc/internal/huge.h +++ b/jemalloc/include/jemalloc/internal/huge.h @@ -25,7 +25,7 @@ void *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); -void huge_dalloc(void *ptr); +void huge_dalloc(void *ptr, bool unmap); size_t huge_salloc(const void *ptr); #ifdef JEMALLOC_PROF prof_ctx_t *huge_prof_ctx_get(const void *ptr); diff --git a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in index 3d25300..0680b43 100644 --- a/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in +++ b/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in @@ -666,7 +666,7 @@ idalloc(void *ptr) if (chunk != ptr) arena_dalloc(chunk->arena, chunk, ptr); else - huge_dalloc(ptr); + huge_dalloc(ptr, true); } JEMALLOC_INLINE void * diff --git a/jemalloc/include/jemalloc/jemalloc_defs.h.in b/jemalloc/include/jemalloc/jemalloc_defs.h.in index b8f3f36..5f46c5c 100644 --- a/jemalloc/include/jemalloc/jemalloc_defs.h.in +++ b/jemalloc/include/jemalloc/jemalloc_defs.h.in @@ -115,6 +115,9 @@ #undef JEMALLOC_ZONE #undef JEMALLOC_ZONE_VERSION +/* If defined, use mremap(...MREMAP_FIXED...) for huge realloc(). */ +#undef JEMALLOC_MREMAP_FIXED + /* * Methods for purging unused pages differ between operating systems. * |