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

Refactor arena_bin_malloc_hard().

Browse Source
This commit is contained in:
Qi Wang 2019-11-05 13:22:54 -08:00 committed by Qi Wang
parent 9a7ae3c97f
commit 9a3c738009
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/arena.c
View File

@ -1311,21 +1311,21 @@ arena_bin_nonfull_slab_get(tsdn_t *tsdn, arena_t *arena, bin_t *bin,
static void * static void *
arena_bin_malloc_hard(tsdn_t *tsdn, arena_t *arena, bin_t *bin, arena_bin_malloc_hard(tsdn_t *tsdn, arena_t *arena, bin_t *bin,
szind_t binind, unsigned binshard) { szind_t binind, unsigned binshard) {
const bin_info_t *bin_info;
extent_t *slab;
bin_info = &bin_infos[binind];
if (!arena_is_auto(arena) && bin->slabcur != NULL) {
arena_bin_slabs_full_insert(arena, bin, bin->slabcur);
bin->slabcur = NULL;
}
slab = arena_bin_nonfull_slab_get(tsdn, arena, bin, binind, binshard);
if (bin->slabcur != NULL) { if (bin->slabcur != NULL) {
/* /* Only attempted when current slab is full. */
* Another thread updated slabcur while this one ran without the assert(extent_nfree_get(bin->slabcur) == 0);
* bin lock in arena_bin_nonfull_slab_get(). }
*/
const bin_info_t *bin_info = &bin_infos[binind];
extent_t *slab = arena_bin_nonfull_slab_get(tsdn, arena, bin, binind,
binshard);
if (bin->slabcur != NULL) {
if (extent_nfree_get(bin->slabcur) > 0) { if (extent_nfree_get(bin->slabcur) > 0) {
/*
* Another thread updated slabcur while this one ran
* without the bin lock in arena_bin_nonfull_slab_get().
*/
void *ret = arena_slab_reg_alloc(bin->slabcur, void *ret = arena_slab_reg_alloc(bin->slabcur,
bin_info); bin_info);
if (slab != NULL) { if (slab != NULL) {
@ -1357,7 +1357,6 @@ arena_bin_malloc_hard(tsdn_t *tsdn, arena_t *arena, bin_t *bin,
return NULL; return NULL;
} }
bin->slabcur = slab; bin->slabcur = slab;
assert(extent_nfree_get(bin->slabcur) > 0); assert(extent_nfree_get(bin->slabcur) > 0);
return arena_slab_reg_alloc(slab, bin_info); return arena_slab_reg_alloc(slab, bin_info);