commit ddb170b1d92d90ecee9ce87545086da9b34839aa
author Qi Wang <interwq@gwu.edu> Mon Jan 10 13:34:07 2022 -0800
committer Qi Wang <interwq@gmail.com> Tue Jan 11 16:59:22 2022 -0800
tree fb659f94488c544fce39a3113023a4fc6f1e32bd
parent 648b3b9f768674934c2bbf260bdc75301a63a314

Simplify arena_migrate() to take arena_t* instead of indices.

This makes debugging slightly easier and avoids the confusion of "should we
create new arenas" here.

include/jemalloc/internal/jemalloc_internal_externs.h

diff --git a/include/jemalloc/internal/jemalloc_internal_externs.h b/include/jemalloc/internal/jemalloc_internal_externs.h
index fa1fabe..fc834c6 100644
--- a/include/jemalloc/internal/jemalloc_internal_externs.h
+++ b/include/jemalloc/internal/jemalloc_internal_externs.h
@@ -62,7 +62,7 @@
 unsigned narenas_total_get(void);
 arena_t *arena_init(tsdn_t *tsdn, unsigned ind, const arena_config_t *config);
 arena_t *arena_choose_hard(tsd_t *tsd, bool internal);
-void arena_migrate(tsd_t *tsd, unsigned oldind, unsigned newind);
+void arena_migrate(tsd_t *tsd, arena_t *oldarena, arena_t *newarena);
 void iarena_cleanup(tsd_t *tsd);
 void arena_cleanup(tsd_t *tsd);
 size_t batch_alloc(void **ptrs, size_t num, size_t size, int flags);

include/jemalloc/internal/jemalloc_internal_inlines_b.h

diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_b.h b/include/jemalloc/internal/jemalloc_internal_inlines_b.h
index 35d71d0..152f8a0 100644
--- a/include/jemalloc/internal/jemalloc_internal_inlines_b.h
+++ b/include/jemalloc/internal/jemalloc_internal_inlines_b.h
@@ -16,7 +16,7 @@
 		assert(newarena != NULL);
 
 		/* Set new arena/tcache associations. */
-		arena_migrate(tsd, oldind, newind);
+		arena_migrate(tsd, oldarena, newarena);
 		tcache_t *tcache = tcache_get(tsd);
 		if (tcache != NULL) {
 			tcache_slow_t *tcache_slow = tsd_tcache_slowp_get(tsd);

src/ctl.c

diff --git a/src/ctl.c b/src/ctl.c
index 5a92512..6e0088f 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -2259,7 +2259,7 @@
 			goto label_return;
 		}
 		/* Set new arena/tcache associations. */
-		arena_migrate(tsd, oldind, newind);
+		arena_migrate(tsd, oldarena, newarena);
 		if (tcache_available(tsd)) {
 			tcache_arena_reassociate(tsd_tsdn(tsd),
 			    tsd_tcache_slowp_get(tsd), tsd_tcachep_get(tsd),

src/jemalloc.c

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 2ffb9f0..17a27ae 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -464,11 +464,10 @@
 }
 
 void
-arena_migrate(tsd_t *tsd, unsigned oldind, unsigned newind) {
-	arena_t *oldarena, *newarena;
+arena_migrate(tsd_t *tsd, arena_t *oldarena, arena_t *newarena) {
+	assert(oldarena != NULL);
+	assert(newarena != NULL);
 
-	oldarena = arena_get(tsd_tsdn(tsd), oldind, false);
-	newarena = arena_get(tsd_tsdn(tsd), newind, false);
 	arena_nthreads_dec(oldarena, false);
 	arena_nthreads_inc(newarena, false);
 	tsd_arena_set(tsd, newarena);