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

edata_cache: Remember the associated base_t.

Browse Source 
This will save us some trouble down the line when we stop passing arena pointers
everywhere; we won't have to pass around a base_t pointer either.
This commit is contained in:
David Goldblatt 2019-12-12 18:28:37 -08:00 committed by David Goldblatt
parent ae23e5f426
commit c792f3e4ab
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/jemalloc/internal/edata_cache.h
View File

@ -12,12 +12,13 @@ struct edata_cache_s {
edata_tree_t avail; edata_tree_t avail;
atomic_zu_t count; atomic_zu_t count;
malloc_mutex_t mtx; malloc_mutex_t mtx;
base_t *base;
}; };
bool edata_cache_init(edata_cache_t *edata_cache); bool edata_cache_init(edata_cache_t *edata_cache, base_t *base);
edata_t *edata_cache_get(tsdn_t *tsdn, edata_cache_t *edata_cache, edata_t *edata_cache_get(tsdn_t *tsdn, edata_cache_t *edata_cache);
base_t *base);
void edata_cache_put(tsdn_t *tsdn, edata_cache_t *edata_cache, edata_t *edata); void edata_cache_put(tsdn_t *tsdn, edata_cache_t *edata_cache, edata_t *edata);
void edata_cache_prefork(tsdn_t *tsdn, edata_cache_t *edata_cache); void edata_cache_prefork(tsdn_t *tsdn, edata_cache_t *edata_cache);
void edata_cache_postfork_parent(tsdn_t *tsdn, edata_cache_t *edata_cache); void edata_cache_postfork_parent(tsdn_t *tsdn, edata_cache_t *edata_cache);
void edata_cache_postfork_child(tsdn_t *tsdn, edata_cache_t *edata_cache); void edata_cache_postfork_child(tsdn_t *tsdn, edata_cache_t *edata_cache);

2
src/arena.c
View File

@ -2052,7 +2052,7 @@ arena_new(tsdn_t *tsdn, unsigned ind, extent_hooks_t *extent_hooks) {
goto label_error; goto label_error;
} }
if (edata_cache_init(&arena->edata_cache)) { if (edata_cache_init(&arena->edata_cache, base)) {
goto label_error; goto label_error;
} }

16
src/edata_cache.c
View File

@ -2,23 +2,29 @@
#include "jemalloc/internal/jemalloc_internal_includes.h" #include "jemalloc/internal/jemalloc_internal_includes.h"
bool bool
edata_cache_init(edata_cache_t *edata_cache) { edata_cache_init(edata_cache_t *edata_cache, base_t *base) {
edata_avail_new(&edata_cache->avail);
/*
* This is not strictly necessary, since the edata_cache_t is only
* created inside an arena, which is zeroed on creation. But this is
* handy as a safety measure.
*/
atomic_store_zu(&edata_cache->count, 0, ATOMIC_RELAXED);
if (malloc_mutex_init(&edata_cache->mtx, "edata_cache", if (malloc_mutex_init(&edata_cache->mtx, "edata_cache",
WITNESS_RANK_EDATA_CACHE, malloc_mutex_rank_exclusive)) { WITNESS_RANK_EDATA_CACHE, malloc_mutex_rank_exclusive)) {
return true; return true;
} }
edata_cache->base = base;
edata_avail_new(&edata_cache->avail);
return false; return false;
} }
edata_t * edata_t *
edata_cache_get(tsdn_t *tsdn, edata_cache_t *edata_cache, base_t *base) { edata_cache_get(tsdn_t *tsdn, edata_cache_t *edata_cache) {
malloc_mutex_lock(tsdn, &edata_cache->mtx); malloc_mutex_lock(tsdn, &edata_cache->mtx);
edata_t *edata = edata_avail_first(&edata_cache->avail); edata_t *edata = edata_avail_first(&edata_cache->avail);
if (edata == NULL) { if (edata == NULL) {
malloc_mutex_unlock(tsdn, &edata_cache->mtx); malloc_mutex_unlock(tsdn, &edata_cache->mtx);
return base_alloc_edata(tsdn, base); return base_alloc_edata(tsdn, edata_cache->base);
} }
edata_avail_remove(&edata_cache->avail, edata); edata_avail_remove(&edata_cache->avail, edata);
atomic_fetch_sub_zu(&edata_cache->count, 1, ATOMIC_RELAXED); atomic_fetch_sub_zu(&edata_cache->count, 1, ATOMIC_RELAXED);

9
src/extent2.c
View File

@ -869,8 +869,7 @@ extent_grow_retained(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
alloc_size = sz_pind2sz(arena->ecache_grow.next + egn_skip); alloc_size = sz_pind2sz(arena->ecache_grow.next + egn_skip);
} }
edata_t *edata = edata_cache_get(tsdn, &arena->edata_cache, edata_t *edata = edata_cache_get(tsdn, &arena->edata_cache);
arena->base);
if (edata == NULL) { if (edata == NULL) {
goto label_err; goto label_err;
} }
@ -1036,8 +1035,7 @@ extent_alloc_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
WITNESS_RANK_CORE, 0); WITNESS_RANK_CORE, 0);
size_t esize = size + pad; size_t esize = size + pad;
edata_t *edata = edata_cache_get(tsdn, &arena->edata_cache, edata_t *edata = edata_cache_get(tsdn, &arena->edata_cache);
arena->base);
if (edata == NULL) { if (edata == NULL) {
return NULL; return NULL;
} }
@ -1430,8 +1428,7 @@ extent_split_impl(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
return NULL; return NULL;
} }
edata_t *trail = edata_cache_get(tsdn, &arena->edata_cache, edata_t *trail = edata_cache_get(tsdn, &arena->edata_cache);
arena->base);
if (trail == NULL) { if (trail == NULL) {
goto label_error_a; goto label_error_a;
} }

2
src/extent_dss.c
View File

@ -123,7 +123,7 @@ extent_alloc_dss(tsdn_t *tsdn, arena_t *arena, void *new_addr, size_t size,
return NULL; return NULL;
} }
gap = edata_cache_get(tsdn, &arena->edata_cache, arena->base); gap = edata_cache_get(tsdn, &arena->edata_cache);
if (gap == NULL) { if (gap == NULL) {
return NULL; return NULL;
} }