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

Fix arena_sdalloc() to use promoted size (second attempt).

Browse Source 
Unlike the preceeding attempted fix, this version avoids the potential
for converting an invalid bin index to a size class.
This commit is contained in:
Jason Evans 2014-10-31 22:26:24 -07:00
parent 6da2e9d4f6
commit d7a9bab92d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/jemalloc/internal/arena.h
View File

@ -1031,26 +1031,29 @@ JEMALLOC_ALWAYS_INLINE void
arena_sdalloc(tsd_t *tsd, arena_chunk_t *chunk, void *ptr, size_t size, arena_sdalloc(tsd_t *tsd, arena_chunk_t *chunk, void *ptr, size_t size,
bool try_tcache) bool try_tcache)
{ {
index_t binind;
tcache_t *tcache; tcache_t *tcache;
assert(ptr != NULL); assert(ptr != NULL);
assert(CHUNK_ADDR2BASE(ptr) != ptr); assert(CHUNK_ADDR2BASE(ptr) != ptr);
if (config_prof && opt_prof) { if (config_prof && opt_prof) {
/* Use promoted size, not request size. */
size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> LG_PAGE; size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> LG_PAGE;
binind = arena_mapbits_binind_get(chunk, pageind); assert(arena_mapbits_allocated_get(chunk, pageind) != 0);
size = index2size(binind); if (arena_mapbits_large_get(chunk, pageind) != 0) {
} else /* Make sure to use promoted size, not request size. */
binind = size2index(size); assert(((uintptr_t)ptr & PAGE_MASK) == 0);
size = arena_mapbits_large_size_get(chunk, pageind);
}
}
assert(s2u(size) == s2u(arena_salloc(ptr, false)));
if (likely(size <= SMALL_MAXCLASS)) { if (likely(size <= SMALL_MAXCLASS)) {
/* Small allocation. */ /* Small allocation. */
if (likely(try_tcache) && likely((tcache = tcache_get(tsd, if (likely(try_tcache) && likely((tcache = tcache_get(tsd,
false)) != NULL)) false)) != NULL)) {
index_t binind = size2index(size);
tcache_dalloc_small(tcache, ptr, binind); tcache_dalloc_small(tcache, ptr, binind);
else { } else {
size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >>
LG_PAGE; LG_PAGE;
arena_dalloc_small(chunk->arena, chunk, ptr, pageind); arena_dalloc_small(chunk->arena, chunk, ptr, pageind);