From c411b0ab3b148938064b37a2409b92443becf572 Mon Sep 17 00:00:00 2001 From: Slobodan Predolac Date: Thu, 28 May 2026 21:10:49 -0400 Subject: [PATCH] Collapse arena_inlines_a/b and jemalloc_internal_inlines_b into arena_inlines.h The arena_inlines_a.h / arena_inlines_b.h split, and the parallel jemalloc_internal_inlines_b.h file that defined arena_choose() between them, all existed to manage one ordering constraint: arena_choose() had to be defined before arena_choose_maybe_huge() (which calls it), but had to be defined after the tsd/tcache inlines it depends on. Three files, one staged include order, no real semantic boundary. After the malloc_dispatch refactor moved the heaviest tcache-pulling inlines (the malloc/dalloc routing) out of arena_inlines_b.h, the arena-side inlines that remain all belong together. Merge them into a single arena_inlines.h that: - explicitly includes jemalloc_internal_inlines_a.h (for tsd accessors) and tcache.h (for tcache_arena_associate / reassociate externs) -- both were previously pulled transitively; - orders functions so each caller appears after its callee (cheap accessors -> arena_choose family -> the rest), so no forward references are needed; - drops the load-bearing-split comment, which is no longer true. All consumers that included any of the three old headers now include arena_inlines.h. background_thread_inlines.h now pulls a heavier set of transitive includes (prof.h, large.h, mutex.h, ...) than when it only needed cheap accessors; this is acceptable because every TU that includes background_thread_inlines.h already pulls those headers via other paths. --- .../{arena_inlines_b.h => arena_inlines.h} | 154 +++++++++++++++--- include/jemalloc/internal/arena_inlines_a.h | 27 --- .../internal/background_thread_inlines.h | 2 +- .../internal/jemalloc_internal_inlines_b.h | 110 ------------- .../internal/jemalloc_internal_inlines_c.h | 2 +- .../internal/malloc_dispatch_inlines.h | 3 +- include/jemalloc/internal/prof_inlines.h | 2 +- include/jemalloc/internal/tcache_inlines.h | 2 +- src/arena.c | 4 +- src/arenas_management.c | 2 +- src/background_thread.c | 3 +- src/bin.c | 2 +- src/ctl.c | 3 +- src/extent.c | 2 +- src/extent_dss.c | 2 +- src/inspect.c | 2 +- src/jemalloc.c | 3 +- src/jemalloc_cpp.cpp | 3 +- src/jemalloc_fork.c | 2 +- src/jemalloc_init.c | 3 +- src/large.c | 2 +- src/prof.c | 2 +- src/prof_data.c | 2 +- src/prof_log.c | 2 +- src/prof_recent.c | 2 +- src/prof_sys.c | 2 +- src/stats.c | 3 +- src/tcache.c | 3 +- src/tsd.c | 3 +- test/include/test/jemalloc_test.h.in | 8 +- 30 files changed, 159 insertions(+), 203 deletions(-) rename include/jemalloc/internal/{arena_inlines_b.h => arena_inlines.h} (69%) delete mode 100644 include/jemalloc/internal/arena_inlines_a.h delete mode 100644 include/jemalloc/internal/jemalloc_internal_inlines_b.h diff --git a/include/jemalloc/internal/arena_inlines_b.h b/include/jemalloc/internal/arena_inlines.h similarity index 69% rename from include/jemalloc/internal/arena_inlines_b.h rename to include/jemalloc/internal/arena_inlines.h index 5cfe7d25..33e91e41 100644 --- a/include/jemalloc/internal/arena_inlines_b.h +++ b/include/jemalloc/internal/arena_inlines.h @@ -1,30 +1,13 @@ -#ifndef JEMALLOC_INTERNAL_ARENA_INLINES_B_H -#define JEMALLOC_INTERNAL_ARENA_INLINES_B_H - -/* - * This split (arena_inlines_a.h + arena_inlines_b.h) is load-bearing, not - * stylistic. arena_inlines_a.h holds the cheap field accessors that only - * depend on arena.h fields. This file holds the larger inlines that depend - * on arena_choose(), prof, large, and friends. - * - * Merging the two would create a real #include cycle through arena_choose(): - * jemalloc_internal_inlines_b.h defines arena_choose() and pulls in - * arena_inlines_a.h at the top for the cheap accessors. arena_choose() is - * called from arena_choose_maybe_huge() in this file. If that #include - * resolved to a merged "arena_inlines.h", arena_choose_maybe_huge() would - * be parsed before arena_choose() exists, and we would get an implicit - * declaration error -- arena_inlines.h cannot pull in - * jemalloc_internal_inlines_b.h to fix it (that file is mid-parse and its - * include guard is already set). - * - * Keep this file separate from arena_inlines_a.h. - */ +#ifndef JEMALLOC_INTERNAL_ARENA_INLINES_H +#define JEMALLOC_INTERNAL_ARENA_INLINES_H #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" +#include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/div.h" #include "jemalloc/internal/emap.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" +#include "jemalloc/internal/extent.h" +#include "jemalloc/internal/jemalloc_internal_inlines_a.h" #include "jemalloc/internal/jemalloc_internal_types.h" #include "jemalloc/internal/large.h" #include "jemalloc/internal/mutex.h" @@ -33,14 +16,139 @@ #include "jemalloc/internal/safety_check.h" #include "jemalloc/internal/sc.h" #include "jemalloc/internal/sz.h" +#include "jemalloc/internal/tcache.h" #include "jemalloc/internal/ticker.h" +/* Cheap field accessors. */ + +static inline unsigned +arena_ind_get(const arena_t *arena) { + return arena->ind; +} + +static inline void +arena_internal_add(arena_t *arena, size_t size) { + atomic_fetch_add_zu(&arena->stats.internal, size, ATOMIC_RELAXED); +} + +static inline void +arena_internal_sub(arena_t *arena, size_t size) { + atomic_fetch_sub_zu(&arena->stats.internal, size, ATOMIC_RELAXED); +} + +static inline size_t +arena_internal_get(const arena_t *arena) { + return atomic_load_zu(&arena->stats.internal, ATOMIC_RELAXED); +} + +static inline bool +arena_is_auto(const arena_t *arena) { + assert(narenas_auto > 0); + + return (arena_ind_get(arena) < manual_arena_base); +} + static inline arena_t * arena_get_from_edata(const edata_t *edata) { return (arena_t *)atomic_load_p( &arenas[edata_arena_ind_get(edata)], ATOMIC_RELAXED); } +/* Arena selection and migration. */ + +static inline void +thread_migrate_arena(tsd_t *tsd, arena_t *oldarena, arena_t *newarena) { + assert(oldarena != NULL); + assert(newarena != NULL); + + arena_migrate(tsd, oldarena, newarena); + if (tcache_available(tsd)) { + tcache_arena_reassociate(tsd_tsdn(tsd), + tsd_tcache_slowp_get(tsd), newarena); + } +} + +static inline void +percpu_arena_update(tsd_t *tsd, unsigned cpu) { + assert(have_percpu_arena); + arena_t *oldarena = tsd_arena_get(tsd); + assert(oldarena != NULL); + unsigned oldind = arena_ind_get(oldarena); + + if (oldind != cpu) { + unsigned newind = cpu; + arena_t *newarena = arena_get(tsd_tsdn(tsd), newind, true); + assert(newarena != NULL); + + thread_migrate_arena(tsd, oldarena, newarena); + } +} + +/* Choose an arena based on a per-thread value. */ +static inline arena_t * +arena_choose_impl(tsd_t *tsd, arena_t *arena, bool internal) { + arena_t *ret; + + if (arena != NULL) { + return arena; + } + + /* During reentrancy, arena 0 is the safest bet. */ + if (unlikely(tsd_reentrancy_level_get(tsd) > 0)) { + return arena_get(tsd_tsdn(tsd), 0, true); + } + + ret = internal ? tsd_iarena_get(tsd) : tsd_arena_get(tsd); + if (unlikely(ret == NULL)) { + ret = arena_choose_hard(tsd, internal); + assert(ret); + if (tcache_available(tsd)) { + tcache_slow_t *tcache_slow = tsd_tcache_slowp_get(tsd); + if (tcache_slow->arena != NULL) { + /* See comments in tsd_tcache_data_init().*/ + assert(tcache_slow->arena + == arena_get(tsd_tsdn(tsd), 0, false)); + if (tcache_slow->arena != ret) { + tcache_arena_reassociate(tsd_tsdn(tsd), + tcache_slow, ret); + } + } else { + tcache_arena_associate( + tsd_tsdn(tsd), tcache_slow, ret); + } + } + } + + /* + * Note that for percpu arena, if the current arena is outside of the + * auto percpu arena range, (i.e. thread is assigned to a manually + * managed arena), then percpu arena is skipped. + */ + if (have_percpu_arena && PERCPU_ARENA_ENABLED(opt_percpu_arena) + && !internal + && (arena_ind_get(ret) < percpu_arena_ind_limit(opt_percpu_arena)) + && (ret->last_thd != tsd_tsdn(tsd))) { + unsigned ind = percpu_arena_choose(); + if (arena_ind_get(ret) != ind) { + percpu_arena_update(tsd, ind); + ret = tsd_arena_get(tsd); + } + ret->last_thd = tsd_tsdn(tsd); + } + + return ret; +} + +static inline arena_t * +arena_choose(tsd_t *tsd, arena_t *arena) { + return arena_choose_impl(tsd, arena, false); +} + +static inline arena_t * +arena_ichoose(tsd_t *tsd, arena_t *arena) { + return arena_choose_impl(tsd, arena, true); +} + JEMALLOC_ALWAYS_INLINE arena_t * arena_choose_maybe_huge(tsd_t *tsd, arena_t *arena, size_t size) { if (arena != NULL) { @@ -288,4 +396,4 @@ arena_get_bin(arena_t *arena, szind_t binind, unsigned binshard) { return shard0 + binshard; } -#endif /* JEMALLOC_INTERNAL_ARENA_INLINES_B_H */ +#endif /* JEMALLOC_INTERNAL_ARENA_INLINES_H */ diff --git a/include/jemalloc/internal/arena_inlines_a.h b/include/jemalloc/internal/arena_inlines_a.h deleted file mode 100644 index d8ecd496..00000000 --- a/include/jemalloc/internal/arena_inlines_a.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef JEMALLOC_INTERNAL_ARENA_INLINES_A_H -#define JEMALLOC_INTERNAL_ARENA_INLINES_A_H - -#include "jemalloc/internal/jemalloc_preamble.h" -#include "jemalloc/internal/arena.h" - -static inline unsigned -arena_ind_get(const arena_t *arena) { - return arena->ind; -} - -static inline void -arena_internal_add(arena_t *arena, size_t size) { - atomic_fetch_add_zu(&arena->stats.internal, size, ATOMIC_RELAXED); -} - -static inline void -arena_internal_sub(arena_t *arena, size_t size) { - atomic_fetch_sub_zu(&arena->stats.internal, size, ATOMIC_RELAXED); -} - -static inline size_t -arena_internal_get(const arena_t *arena) { - return atomic_load_zu(&arena->stats.internal, ATOMIC_RELAXED); -} - -#endif /* JEMALLOC_INTERNAL_ARENA_INLINES_A_H */ diff --git a/include/jemalloc/internal/background_thread_inlines.h b/include/jemalloc/internal/background_thread_inlines.h index 67517626..ba6e6644 100644 --- a/include/jemalloc/internal/background_thread_inlines.h +++ b/include/jemalloc/internal/background_thread_inlines.h @@ -2,7 +2,7 @@ #define JEMALLOC_INTERNAL_BACKGROUND_THREAD_INLINES_H #include "jemalloc/internal/jemalloc_preamble.h" -#include "jemalloc/internal/arena_inlines_a.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/atomic.h" #include "jemalloc/internal/background_thread.h" diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_b.h b/include/jemalloc/internal/jemalloc_internal_inlines_b.h deleted file mode 100644 index 2c91cb77..00000000 --- a/include/jemalloc/internal/jemalloc_internal_inlines_b.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef JEMALLOC_INTERNAL_INLINES_B_H -#define JEMALLOC_INTERNAL_INLINES_B_H - -#include "jemalloc/internal/jemalloc_preamble.h" -#include "jemalloc/internal/arena_inlines_a.h" -#include "jemalloc/internal/arenas_management.h" -#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) { - assert(oldarena != NULL); - assert(newarena != NULL); - - arena_migrate(tsd, oldarena, newarena); - if (tcache_available(tsd)) { - tcache_arena_reassociate(tsd_tsdn(tsd), - tsd_tcache_slowp_get(tsd), newarena); - } -} - -static inline void -percpu_arena_update(tsd_t *tsd, unsigned cpu) { - assert(have_percpu_arena); - arena_t *oldarena = tsd_arena_get(tsd); - assert(oldarena != NULL); - unsigned oldind = arena_ind_get(oldarena); - - if (oldind != cpu) { - unsigned newind = cpu; - arena_t *newarena = arena_get(tsd_tsdn(tsd), newind, true); - assert(newarena != NULL); - - thread_migrate_arena(tsd, oldarena, newarena); - } -} - -/* Choose an arena based on a per-thread value. */ -static inline arena_t * -arena_choose_impl(tsd_t *tsd, arena_t *arena, bool internal) { - arena_t *ret; - - if (arena != NULL) { - return arena; - } - - /* During reentrancy, arena 0 is the safest bet. */ - if (unlikely(tsd_reentrancy_level_get(tsd) > 0)) { - return arena_get(tsd_tsdn(tsd), 0, true); - } - - ret = internal ? tsd_iarena_get(tsd) : tsd_arena_get(tsd); - if (unlikely(ret == NULL)) { - ret = arena_choose_hard(tsd, internal); - assert(ret); - if (tcache_available(tsd)) { - tcache_slow_t *tcache_slow = tsd_tcache_slowp_get(tsd); - if (tcache_slow->arena != NULL) { - /* See comments in tsd_tcache_data_init().*/ - assert(tcache_slow->arena - == arena_get(tsd_tsdn(tsd), 0, false)); - if (tcache_slow->arena != ret) { - tcache_arena_reassociate(tsd_tsdn(tsd), - tcache_slow, ret); - } - } else { - tcache_arena_associate( - tsd_tsdn(tsd), tcache_slow, ret); - } - } - } - - /* - * Note that for percpu arena, if the current arena is outside of the - * auto percpu arena range, (i.e. thread is assigned to a manually - * managed arena), then percpu arena is skipped. - */ - if (have_percpu_arena && PERCPU_ARENA_ENABLED(opt_percpu_arena) - && !internal - && (arena_ind_get(ret) < percpu_arena_ind_limit(opt_percpu_arena)) - && (ret->last_thd != tsd_tsdn(tsd))) { - unsigned ind = percpu_arena_choose(); - if (arena_ind_get(ret) != ind) { - percpu_arena_update(tsd, ind); - ret = tsd_arena_get(tsd); - } - ret->last_thd = tsd_tsdn(tsd); - } - - return ret; -} - -static inline arena_t * -arena_choose(tsd_t *tsd, arena_t *arena) { - return arena_choose_impl(tsd, arena, false); -} - -static inline arena_t * -arena_ichoose(tsd_t *tsd, arena_t *arena) { - return arena_choose_impl(tsd, arena, true); -} - -static inline bool -arena_is_auto(const arena_t *arena) { - assert(narenas_auto > 0); - - return (arena_ind_get(arena) < manual_arena_base); -} - -#endif /* JEMALLOC_INTERNAL_INLINES_B_H */ diff --git a/include/jemalloc/internal/jemalloc_internal_inlines_c.h b/include/jemalloc/internal/jemalloc_internal_inlines_c.h index 389cf6cf..6bec6d6f 100644 --- a/include/jemalloc/internal/jemalloc_internal_inlines_c.h +++ b/include/jemalloc/internal/jemalloc_internal_inlines_c.h @@ -3,7 +3,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/emap.h" #include "jemalloc/internal/jemalloc_init.h" #include "jemalloc/internal/jemalloc_internal_types.h" diff --git a/include/jemalloc/internal/malloc_dispatch_inlines.h b/include/jemalloc/internal/malloc_dispatch_inlines.h index 79405120..b6145c85 100644 --- a/include/jemalloc/internal/malloc_dispatch_inlines.h +++ b/include/jemalloc/internal/malloc_dispatch_inlines.h @@ -3,11 +3,10 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/bin.h" #include "jemalloc/internal/div.h" #include "jemalloc/internal/emap.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_types.h" #include "jemalloc/internal/large.h" #include "jemalloc/internal/malloc_dispatch_externs.h" diff --git a/include/jemalloc/internal/prof_inlines.h b/include/jemalloc/internal/prof_inlines.h index 5adf0c4e..e3e63f25 100644 --- a/include/jemalloc/internal/prof_inlines.h +++ b/include/jemalloc/internal/prof_inlines.h @@ -2,7 +2,7 @@ #define JEMALLOC_INTERNAL_PROF_INLINES_H #include "jemalloc/internal/jemalloc_preamble.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/prof.h" #include "jemalloc/internal/safety_check.h" diff --git a/include/jemalloc/internal/tcache_inlines.h b/include/jemalloc/internal/tcache_inlines.h index 2b767391..7abcbb40 100644 --- a/include/jemalloc/internal/tcache_inlines.h +++ b/include/jemalloc/internal/tcache_inlines.h @@ -4,7 +4,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" #include "jemalloc/internal/bin.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/jemalloc_internal_types.h" #include "jemalloc/internal/large.h" #include "jemalloc/internal/san.h" diff --git a/src/arena.c b/src/arena.c index d17841bb..c4a31f63 100644 --- a/src/arena.c +++ b/src/arena.c @@ -1,8 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_a.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" #include "jemalloc/internal/background_thread_inlines.h" @@ -12,7 +11,6 @@ #include "jemalloc/internal/extent_dss.h" #include "jemalloc/internal/extent_mmap.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/large.h" #include "jemalloc/internal/mutex.h" diff --git a/src/arenas_management.c b/src/arenas_management.c index e4d2aa75..394303a3 100644 --- a/src/arenas_management.c +++ b/src/arenas_management.c @@ -6,7 +6,7 @@ #include "jemalloc/internal/background_thread_inlines.h" #include "jemalloc/internal/jemalloc_init.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/malloc_io.h" #include "jemalloc/internal/mutex.h" diff --git a/src/background_thread.c b/src/background_thread.c index f25dc403..dcda912f 100644 --- a/src/background_thread.c +++ b/src/background_thread.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" @@ -9,7 +9,6 @@ #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/jemalloc_init.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/malloc_io.h" #include "jemalloc/internal/mutex.h" diff --git a/src/bin.c b/src/bin.c index ac17f16a..694579b9 100644 --- a/src/bin.c +++ b/src/bin.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/bin.h" #include "jemalloc/internal/sc.h" diff --git a/src/ctl.c b/src/ctl.c index ef5e57af..3d628429 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" @@ -11,7 +11,6 @@ #include "jemalloc/internal/extent_mmap.h" #include "jemalloc/internal/inspect.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/mutex.h" #include "jemalloc/internal/nstime.h" diff --git a/src/extent.c b/src/extent.c index 708a2807..2e2977f3 100644 --- a/src/extent.c +++ b/src/extent.c @@ -10,7 +10,7 @@ #include "jemalloc/internal/extent_dss.h" #include "jemalloc/internal/extent_mmap.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/mutex.h" #include "jemalloc/internal/pac.h" #include "jemalloc/internal/ph.h" diff --git a/src/extent_dss.c b/src/extent_dss.c index 16faa0a2..16dbe8a2 100644 --- a/src/extent_dss.c +++ b/src/extent_dss.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_a.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/edata_cache.h" #include "jemalloc/internal/extent.h" diff --git a/src/inspect.c b/src/inspect.c index b2a961b2..587d9236 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/bin_info.h" #include "jemalloc/internal/edata.h" #include "jemalloc/internal/emap.h" diff --git a/src/jemalloc.c b/src/jemalloc.c index e7468724..12fc5f6e 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/atomic.h" @@ -15,7 +15,6 @@ #include "jemalloc/internal/fxp.h" #include "jemalloc/internal/jemalloc_init.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/jemalloc_internal_types.h" #include "jemalloc/internal/large.h" diff --git a/src/jemalloc_cpp.cpp b/src/jemalloc_cpp.cpp index 9561ea4f..193b536b 100644 --- a/src/jemalloc_cpp.cpp +++ b/src/jemalloc_cpp.cpp @@ -9,10 +9,9 @@ extern "C" { #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/jemalloc_internal_externs.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/malloc_io.h" #include "jemalloc/internal/prof.h" diff --git a/src/jemalloc_fork.c b/src/jemalloc_fork.c index 3fc89c68..6d23c47e 100644 --- a/src/jemalloc_fork.c +++ b/src/jemalloc_fork.c @@ -7,7 +7,7 @@ #include "jemalloc/internal/jemalloc_fork.h" #include "jemalloc/internal/jemalloc_init.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/mutex.h" #include "jemalloc/internal/prof.h" #include "jemalloc/internal/tcache.h" diff --git a/src/jemalloc_init.c b/src/jemalloc_init.c index b62f10a3..88ae41c3 100644 --- a/src/jemalloc_init.c +++ b/src/jemalloc_init.c @@ -1,12 +1,11 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/background_thread.h" #include "jemalloc/internal/background_thread_inlines.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/prof.h" #include "jemalloc/internal/prof_inlines.h" diff --git a/src/large.c b/src/large.c index 197cb0ba..f5894cfa 100644 --- a/src/large.c +++ b/src/large.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/emap.h" #include "jemalloc/internal/extent.h" diff --git a/src/prof.c b/src/prof.c index 4fb5ba5f..eff0fc76 100644 --- a/src/prof.c +++ b/src/prof.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/counter.h" #include "jemalloc/internal/ctl.h" diff --git a/src/prof_data.c b/src/prof_data.c index f3651356..d11f7907 100644 --- a/src/prof_data.c +++ b/src/prof_data.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/hash.h" diff --git a/src/prof_log.c b/src/prof_log.c index a5dbe18b..a1f8dfa0 100644 --- a/src/prof_log.c +++ b/src/prof_log.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/buf_writer.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" diff --git a/src/prof_recent.c b/src/prof_recent.c index dbc0fe4a..23146ec4 100644 --- a/src/prof_recent.c +++ b/src/prof_recent.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/buf_writer.h" #include "jemalloc/internal/emitter.h" diff --git a/src/prof_sys.c b/src/prof_sys.c index 0acb9797..7067b152 100644 --- a/src/prof_sys.c +++ b/src/prof_sys.c @@ -1,7 +1,7 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/buf_writer.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" diff --git a/src/stats.c b/src/stats.c index 7e30ce8b..bf016d7c 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1,14 +1,13 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" #include "jemalloc/internal/ctl.h" #include "jemalloc/internal/emitter.h" #include "jemalloc/internal/fxp.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/mutex.h" #include "jemalloc/internal/mutex_prof.h" #include "jemalloc/internal/prof.h" diff --git a/src/tcache.c b/src/tcache.c index 16e5e4fd..012579bd 100644 --- a/src/tcache.c +++ b/src/tcache.c @@ -1,14 +1,13 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_b.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" #include "jemalloc/internal/background_thread_inlines.h" #include "jemalloc/internal/base.h" #include "jemalloc/internal/emap.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/jemalloc_internal_inlines_c.h" #include "jemalloc/internal/large.h" #include "jemalloc/internal/mutex.h" diff --git a/src/tsd.c b/src/tsd.c index b639aac5..814a4e70 100644 --- a/src/tsd.c +++ b/src/tsd.c @@ -1,13 +1,12 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/arena.h" -#include "jemalloc/internal/arena_inlines_a.h" +#include "jemalloc/internal/arena_inlines.h" #include "jemalloc/internal/arenas_management.h" #include "jemalloc/internal/assert.h" #include "jemalloc/internal/background_thread.h" #include "jemalloc/internal/ckh.h" #include "jemalloc/internal/jemalloc_internal_inlines_a.h" -#include "jemalloc/internal/jemalloc_internal_inlines_b.h" #include "jemalloc/internal/malloc_io.h" #include "jemalloc/internal/mutex.h" #include "jemalloc/internal/prof.h" diff --git a/test/include/test/jemalloc_test.h.in b/test/include/test/jemalloc_test.h.in index 12cedc57..c263c32a 100644 --- a/test/include/test/jemalloc_test.h.in +++ b/test/include/test/jemalloc_test.h.in @@ -54,10 +54,8 @@ extern "C" { # include "jemalloc/internal/prof.h" # include "jemalloc/internal/background_thread.h" # include "jemalloc/internal/jemalloc_internal_inlines_a.h" -# include "jemalloc/internal/arena_inlines_a.h" -# include "jemalloc/internal/jemalloc_internal_inlines_b.h" +# include "jemalloc/internal/arena_inlines.h" # include "jemalloc/internal/tcache_inlines.h" -# include "jemalloc/internal/arena_inlines_b.h" # include "jemalloc/internal/jemalloc_internal_inlines_c.h" # include "jemalloc/internal/prof_inlines.h" # include "jemalloc/internal/background_thread_inlines.h" @@ -112,10 +110,8 @@ extern "C" { # include "jemalloc/internal/prof.h" # include "jemalloc/internal/background_thread.h" # include "jemalloc/internal/jemalloc_internal_inlines_a.h" -# include "jemalloc/internal/arena_inlines_a.h" -# include "jemalloc/internal/jemalloc_internal_inlines_b.h" +# include "jemalloc/internal/arena_inlines.h" # include "jemalloc/internal/tcache_inlines.h" -# include "jemalloc/internal/arena_inlines_b.h" # include "jemalloc/internal/jemalloc_internal_inlines_c.h" # include "jemalloc/internal/prof_inlines.h" # include "jemalloc/internal/background_thread_inlines.h"