diff options
| author | Shocker <shocker@freakz.ro> | 2012-04-16 18:19:57 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2012-04-16 18:19:57 -0700 |
| commit | d6133d102800c80d55c103ae27ab8fb7e18f2f1d (patch) | |
| tree | 8896ab1d5c2131fd2ea645f2bea962d336462b5f /dep/jemalloc/src/chunk.c | |
| parent | 3189b57bf527fa82faea289400c61a3f969d390a (diff) | |
| parent | 126fd13e5d6b57dc0c8830248d44db504c7d103f (diff) | |
Merge pull request #6187 from GiR-Blunti/master
Updated jemalloc library to version 2.2.5
Diffstat (limited to 'dep/jemalloc/src/chunk.c')
| -rw-r--r-- | dep/jemalloc/src/chunk.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/dep/jemalloc/src/chunk.c b/dep/jemalloc/src/chunk.c index 301519e8042..d190c6f49b3 100644 --- a/dep/jemalloc/src/chunk.c +++ b/dep/jemalloc/src/chunk.c @@ -70,7 +70,7 @@ RETURN: #ifdef JEMALLOC_IVSALLOC if (base == false && ret != NULL) { if (rtree_set(chunks_rtree, (uintptr_t)ret, ret)) { - chunk_dealloc(ret, size); + chunk_dealloc(ret, size, true); return (NULL); } } @@ -108,7 +108,7 @@ RETURN: } void -chunk_dealloc(void *chunk, size_t size) +chunk_dealloc(void *chunk, size_t size, bool unmap) { assert(chunk != NULL); @@ -125,15 +125,17 @@ chunk_dealloc(void *chunk, size_t size) malloc_mutex_unlock(&chunks_mtx); #endif + if (unmap) { #ifdef JEMALLOC_SWAP - if (swap_enabled && chunk_dealloc_swap(chunk, size) == false) - return; + if (swap_enabled && chunk_dealloc_swap(chunk, size) == false) + return; #endif #ifdef JEMALLOC_DSS - if (chunk_dealloc_dss(chunk, size) == false) - return; + if (chunk_dealloc_dss(chunk, size) == false) + return; #endif - chunk_dealloc_mmap(chunk, size); + chunk_dealloc_mmap(chunk, size); + } } bool |