project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #151 from thestinger/ralloc

Browse Source 
use sized deallocation internally for ralloc
This commit is contained in:
Jason Evans 2014-10-16 13:12:05 -07:00
commit 8f47e3d82b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arena.c
View File

@ -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; copysize = (size < oldsize) ? size : oldsize;
JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, copysize); JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(ret, copysize);
memcpy(ret, ptr, copysize); memcpy(ret, ptr, copysize);
iqalloc(tsd, ptr, try_tcache_dalloc); isqalloc(tsd, ptr, oldsize, try_tcache_dalloc);
return (ret); return (ret);
} }

2
src/huge.c
View File

@ -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; copysize = (size < oldsize) ? size : oldsize;
memcpy(ret, ptr, copysize); memcpy(ret, ptr, copysize);
iqalloc(tsd, ptr, try_tcache_dalloc); isqalloc(tsd, ptr, oldsize, try_tcache_dalloc);
return (ret); return (ret);
} }