lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-25 14:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate arena create ctl

Browse Source
This commit is contained in:
Slobodan Predolac
2026-05-22 14:03:19 -07:00
parent cc7be7fbe2
commit 206e3cb1a2
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/ctl.c
View File

@@ -3309,23 +3309,34 @@ arenas_lextent_i_index(
} }
static int static int
arenas_create_ctl(tsd_t *tsd, const size_t *mib, size_t miblen, void *oldp, ctl_arena_create(tsd_t *tsd, void *oldp, size_t *oldlenp,
size_t *oldlenp, void *newp, size_t newlen) { const arena_config_t *config) {
int ret; int ret;
unsigned arena_ind; unsigned arena_ind;
malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx); if ((arena_ind = ctl_arena_init(tsd, config)) == UINT_MAX) {
VERIFY_READ(unsigned);
arena_config_t config = arena_config_default;
WRITE(config.extent_hooks, extent_hooks_t *);
if ((arena_ind = ctl_arena_init(tsd, &config)) == UINT_MAX) {
ret = EAGAIN; ret = EAGAIN;
goto label_return; goto label_return;
} }
READ(arena_ind, unsigned); READ(arena_ind, unsigned);
ret = 0; ret = 0;
label_return:
return ret;
}
static int
arenas_create_ctl(tsd_t *tsd, const size_t *mib, size_t miblen, void *oldp,
size_t *oldlenp, void *newp, size_t newlen) {
int ret;
malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx);
VERIFY_READ(unsigned);
arena_config_t config = arena_config_default;
WRITE(config.extent_hooks, extent_hooks_t *);
ret = ctl_arena_create(tsd, oldp, oldlenp, &config);
label_return: label_return:
malloc_mutex_unlock(tsd_tsdn(tsd), &ctl_mtx); malloc_mutex_unlock(tsd_tsdn(tsd), &ctl_mtx);
return ret; return ret;
@@ -3335,7 +3346,6 @@ static int
experimental_arenas_create_ext_ctl(tsd_t *tsd, const size_t *mib, size_t miblen, experimental_arenas_create_ext_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
void *oldp, size_t *oldlenp, void *newp, size_t newlen) { void *oldp, size_t *oldlenp, void *newp, size_t newlen) {
int ret; int ret;
unsigned arena_ind;
malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx); malloc_mutex_lock(tsd_tsdn(tsd), &ctl_mtx);
@@ -3343,12 +3353,7 @@ experimental_arenas_create_ext_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
VERIFY_READ(unsigned); VERIFY_READ(unsigned);
WRITE(config, arena_config_t); WRITE(config, arena_config_t);
if ((arena_ind = ctl_arena_init(tsd, &config)) == UINT_MAX) { ret = ctl_arena_create(tsd, oldp, oldlenp, &config);
ret = EAGAIN;
goto label_return;
}
READ(arena_ind, unsigned);
ret = 0;
label_return: label_return:
malloc_mutex_unlock(tsd_tsdn(tsd), &ctl_mtx); malloc_mutex_unlock(tsd_tsdn(tsd), &ctl_mtx);
return ret; return ret;