diff options
author | Jason Evans <jasone@canonware.com> | 2014-10-16 20:12:05 (GMT) |
---|---|---|
committer | Jason Evans <jasone@canonware.com> | 2014-10-16 20:12:05 (GMT) |
commit | 8f47e3d82be11eb5e36cab597fa6579b8c08b3ac (patch) | |
tree | 2fa80f2def524cba42ca0df36d41f03e796a83bd | |
parent | c83bccd27396cbb6e818d83cc360a58aef96558d (diff) | |
parent | a9ea10d27c320926cab2e59c66ebcd25c49df24c (diff) | |
download | jemalloc-8f47e3d82be11eb5e36cab597fa6579b8c08b3ac.zip jemalloc-8f47e3d82be11eb5e36cab597fa6579b8c08b3ac.tar.gz jemalloc-8f47e3d82be11eb5e36cab597fa6579b8c08b3ac.tar.bz2 |
Merge pull request #151 from thestinger/ralloc
use sized deallocation internally for ralloc
-rw-r--r-- | src/arena.c | 2 | ||||
-rw-r--r-- | src/huge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arena.c b/src/arena.c index 586e3c7..d7377ae 100644 --- a/src/arena.c +++ b/src/arena.c @@ -2220,7 +2220,7 @@ arena_ralloc(tsd_t *tsd, arena_t *arena, void *ptr, size_t oldsize, size_t size, copysize = (size < oldsize) ? size : oldsize; JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, copysize); memcpy(ret, ptr, copysize); - iqalloc(tsd, ptr, try_tcache_dalloc); + isqalloc(tsd, ptr, oldsize, try_tcache_dalloc); return (ret); } @@ -328,7 +328,7 @@ huge_ralloc(tsd_t *tsd, arena_t *arena, void *ptr, size_t oldsize, size_t size, */ copysize = (size < oldsize) ? size : oldsize; memcpy(ret, ptr, copysize); - iqalloc(tsd, ptr, try_tcache_dalloc); + isqalloc(tsd, ptr, oldsize, try_tcache_dalloc); return (ret); } |