romenskiy2012/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-05-15 01:16:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fold tcache reassociation into thread_migrate_arena helper

Browse source
This commit is contained in:
Slobodan Predolac 2026-05-08 10:01:00 -07:00
parent 54ef51121b
commit f9c84860e0
3 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/jemalloc/internal/jemalloc_internal_inlines_b.h
View file

@ -7,6 +7,16 @@
#include "jemalloc/internal/extent.h"
#include "jemalloc/internal/jemalloc_internal_inlines_a.h"
static inline void
thread_migrate_arena(tsd_t *tsd, arena_t *oldarena, arena_t *newarena) {
arena_migrate(tsd, oldarena, newarena);
if (tcache_available(tsd)) {
tcache_arena_reassociate(tsd_tsdn(tsd),
tsd_tcache_slowp_get(tsd), tsd_tcachep_get(tsd),
newarena);
}
}
static inline void
percpu_arena_update(tsd_t *tsd, unsigned cpu) {
assert(have_percpu_arena);
@ -19,15 +29,7 @@ percpu_arena_update(tsd_t *tsd, unsigned cpu) {
arena_t *newarena = arena_get(tsd_tsdn(tsd), newind, true);
assert(newarena != NULL);
/* Set new arena/tcache associations. */
arena_migrate(tsd, oldarena, newarena);
tcache_t *tcache = tcache_get(tsd);
if (tcache != NULL) {
tcache_slow_t *tcache_slow = tsd_tcache_slowp_get(tsd);
assert(tcache_slow->arena != NULL);
tcache_arena_reassociate(
tsd_tsdn(tsd), tcache_slow, tcache, newarena);
}
thread_migrate_arena(tsd, oldarena, newarena);
}
}

8
src/ctl.c
View file

@ -2320,13 +2320,7 @@ thread_arena_ctl(tsd_t *tsd, const size_t *mib, size_t miblen, void *oldp,
ret = EAGAIN;
goto label_return;
}
/* Set new arena/tcache associations. */
arena_migrate(tsd, oldarena, newarena);
if (tcache_available(tsd)) {
tcache_arena_reassociate(tsd_tsdn(tsd),
tsd_tcache_slowp_get(tsd), tsd_tcachep_get(tsd),
newarena);
}
thread_migrate_arena(tsd, oldarena, newarena);
}
ret = 0;

18
test/unit/arenas_management.c
View file

@ -86,9 +86,10 @@ TEST_BEGIN(test_arena_init_idempotent_auto) {
TEST_END
/*
* test_arena_migrate spawns one worker thread, binds it to arena1, then has
* it migrate to arena2. We verify the nthreads counters on both arenas and
* that the migrating thread's tsd_arena was re-pointed.
* test_thread_migrate_arena spawns one worker thread, binds it to arena1,
* then migrates it to arena2 via the thread-level helper. We verify the
* nthreads counters on both arenas, that the migrating thread's tsd_arena
* was re-pointed, and that its tcache (if active) was reassociated.
*/
static unsigned migrate_a1_ind;
static unsigned migrate_a2_ind;
@ -110,11 +111,16 @@ migrate_worker(void *unused) {
expect_ptr_not_null(a1, "arena1 should exist");
expect_ptr_not_null(a2, "arena2 should exist");
arena_migrate(tsd, a1, a2);
thread_migrate_arena(tsd, a1, a2);
expect_ptr_eq(
tsd_arena_get(tsd), a2, "tsd_arena was not updated to newarena");
if (tcache_available(tsd)) {
expect_ptr_eq(tsd_tcache_slowp_get(tsd)->arena, a2,
"tcache should be reassociated with newarena");
}
atomic_store_b(&migrate_done, true, ATOMIC_RELEASE);
while (!atomic_load_b(&migrate_go_exit, ATOMIC_ACQUIRE)) {
@ -123,7 +129,7 @@ migrate_worker(void *unused) {
return NULL;
}
TEST_BEGIN(test_arena_migrate) {
TEST_BEGIN(test_thread_migrate_arena) {
atomic_store_b(&migrate_done, false, ATOMIC_RELEASE);
atomic_store_b(&migrate_go_exit, false, ATOMIC_RELEASE);
@ -250,5 +256,5 @@ main(void) {
test_narenas_total_set_roundtrip, test_narenas_auto_set_roundtrip,
test_manual_arena_base_set_roundtrip, test_arena_set_roundtrip,
test_arena_init_creates_arena, test_arena_init_idempotent_auto,
test_arena_migrate, test_arena_cleanup, test_iarena_cleanup);
test_thread_migrate_arena, test_arena_cleanup, test_iarena_cleanup);
}