Added extents_dirty / _muzzy mutexes, as well as decay_dirty / _muzzy.
This commit is contained in:
parent
64c5f5c174
commit
20b8c70e9f
@ -5,7 +5,7 @@
|
||||
#define CTL_MAX_DEPTH 7
|
||||
|
||||
#define NUM_GLOBAL_PROF_MUTEXES 3
|
||||
#define NUM_ARENA_PROF_MUTEXES 6
|
||||
#define NUM_ARENA_PROF_MUTEXES 8
|
||||
#define NUM_MUTEX_PROF_COUNTERS 7
|
||||
|
||||
extern const char *arena_mutex_names[NUM_ARENA_PROF_MUTEXES];
|
||||
|
@ -126,10 +126,12 @@ struct arena_stats_s {
|
||||
|
||||
mutex_prof_data_t large_mtx_data;
|
||||
mutex_prof_data_t extent_freelist_mtx_data;
|
||||
mutex_prof_data_t extents_cached_mtx_data;
|
||||
mutex_prof_data_t extents_dirty_mtx_data;
|
||||
mutex_prof_data_t extents_muzzy_mtx_data;
|
||||
mutex_prof_data_t extents_retained_mtx_data;
|
||||
mutex_prof_data_t decay_mtx_data;
|
||||
mutex_prof_data_t tcache_mtx_data;
|
||||
mutex_prof_data_t decay_dirty_mtx_data;
|
||||
mutex_prof_data_t decay_muzzy_mtx_data;
|
||||
mutex_prof_data_t tcache_list_mtx_data;
|
||||
|
||||
/* One element for each large size class. */
|
||||
malloc_large_stats_t lstats[NSIZES - NBINS];
|
||||
|
11
src/arena.c
11
src/arena.c
@ -292,7 +292,7 @@ arena_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
|
||||
tbin->ncached * index2size(i));
|
||||
}
|
||||
}
|
||||
malloc_mutex_prof_read(tsdn, &astats->tcache_mtx_data,
|
||||
malloc_mutex_prof_read(tsdn, &astats->tcache_list_mtx_data,
|
||||
&arena->tcache_ql_mtx);
|
||||
malloc_mutex_unlock(tsdn, &arena->tcache_ql_mtx);
|
||||
}
|
||||
@ -306,11 +306,14 @@ arena_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
|
||||
READ_ARENA_MUTEX_PROF_DATA(large_mtx, large_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(extent_freelist_mtx,
|
||||
extent_freelist_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(extents_cached.mtx,
|
||||
extents_cached_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(extents_dirty.mtx,
|
||||
extents_dirty_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(extents_muzzy.mtx,
|
||||
extents_muzzy_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(extents_retained.mtx,
|
||||
extents_retained_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(decay.mtx, decay_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(decay_dirty.mtx, decay_dirty_mtx_data)
|
||||
READ_ARENA_MUTEX_PROF_DATA(decay_muzzy.mtx, decay_muzzy_mtx_data)
|
||||
#undef READ_ARENA_MUTEX_PROF_DATA
|
||||
|
||||
for (szind_t i = 0; i < NBINS; i++) {
|
||||
|
81
src/ctl.c
81
src/ctl.c
@ -22,10 +22,12 @@ const char *global_mutex_names[NUM_GLOBAL_PROF_MUTEXES] = {
|
||||
const char *arena_mutex_names[NUM_ARENA_PROF_MUTEXES] = {
|
||||
"large",
|
||||
"extent_freelist",
|
||||
"extents_cached",
|
||||
"extents_dirty",
|
||||
"extents_muzzy",
|
||||
"extents_retained",
|
||||
"decay",
|
||||
"tcache"
|
||||
"decay_dirty",
|
||||
"decay_muzzy",
|
||||
"tcache_list"
|
||||
};
|
||||
|
||||
const char *mutex_counter_names[NUM_MUTEX_PROF_COUNTERS] = {
|
||||
@ -225,10 +227,12 @@ MUTEX_STATS_CTL_PROTO_GEN(arenas_i_bins_j_mutex)
|
||||
/* Per arena mutexes. */
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(large)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(extent_freelist)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(extents_cached)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(extents_dirty)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(extents_muzzy)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(extents_retained)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(decay)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(tcache)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(decay_dirty)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(decay_muzzy)
|
||||
ARENA_MUTEXES_CTL_PROTO_GEN(tcache_list)
|
||||
#undef ARENA_MUTEXES_CTL_PROTO_GEN
|
||||
#undef MUTEX_STATS_CTL_PROTO_GEN
|
||||
|
||||
@ -461,21 +465,30 @@ static const ctl_indexed_node_t stats_arenas_i_lextents_node[] = {
|
||||
|
||||
ARENA_MUTEX_PROF_DATA_NODE(large)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(extent_freelist)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(extents_cached)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(extents_dirty)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(extents_muzzy)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(extents_retained)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(decay)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(tcache)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(decay_dirty)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(decay_muzzy)
|
||||
ARENA_MUTEX_PROF_DATA_NODE(tcache_list)
|
||||
|
||||
static const ctl_named_node_t stats_arenas_i_mutexes_node[] = {
|
||||
{NAME("large"), CHILD(named, stats_arenas_i_mutexes_large)},
|
||||
{NAME("large"),
|
||||
CHILD(named, stats_arenas_i_mutexes_large)},
|
||||
{NAME("extent_freelist"),
|
||||
CHILD(named, stats_arenas_i_mutexes_extent_freelist)},
|
||||
{NAME("extents_cached"),
|
||||
CHILD(named, stats_arenas_i_mutexes_extents_cached)},
|
||||
{NAME("extents_dirty"),
|
||||
CHILD(named, stats_arenas_i_mutexes_extents_dirty)},
|
||||
{NAME("extents_muzzy"),
|
||||
CHILD(named, stats_arenas_i_mutexes_extents_muzzy)},
|
||||
{NAME("extents_retained"),
|
||||
CHILD(named, stats_arenas_i_mutexes_extents_retained)},
|
||||
{NAME("decay"), CHILD(named, stats_arenas_i_mutexes_decay)},
|
||||
{NAME("tcache"), CHILD(named, stats_arenas_i_mutexes_tcache)}
|
||||
{NAME("decay_dirty"),
|
||||
CHILD(named, stats_arenas_i_mutexes_decay_dirty)},
|
||||
{NAME("decay_muzzy"),
|
||||
CHILD(named, stats_arenas_i_mutexes_decay_muzzy)},
|
||||
{NAME("tcache_list"),
|
||||
CHILD(named, stats_arenas_i_mutexes_tcache_list)}
|
||||
};
|
||||
|
||||
static const ctl_named_node_t stats_arenas_i_node[] = {
|
||||
@ -777,15 +790,20 @@ ctl_arena_stats_sdmerge(ctl_arena_t *ctl_sdarena, ctl_arena_t *ctl_arena,
|
||||
&(sdstats->astats.extent_freelist_mtx_data),
|
||||
&(astats->astats.extent_freelist_mtx_data));
|
||||
malloc_mutex_prof_merge(
|
||||
&(sdstats->astats.extents_cached_mtx_data),
|
||||
&(astats->astats.extents_cached_mtx_data));
|
||||
&(sdstats->astats.extents_dirty_mtx_data),
|
||||
&(astats->astats.extents_dirty_mtx_data));
|
||||
malloc_mutex_prof_merge(
|
||||
&(sdstats->astats.extents_muzzy_mtx_data),
|
||||
&(astats->astats.extents_muzzy_mtx_data));
|
||||
malloc_mutex_prof_merge(
|
||||
&(sdstats->astats.extents_retained_mtx_data),
|
||||
&(astats->astats.extents_retained_mtx_data));
|
||||
malloc_mutex_prof_merge(&(sdstats->astats.decay_mtx_data),
|
||||
&(astats->astats.decay_mtx_data));
|
||||
malloc_mutex_prof_merge(&(sdstats->astats.tcache_mtx_data),
|
||||
&(astats->astats.tcache_mtx_data));
|
||||
malloc_mutex_prof_merge(&(sdstats->astats.decay_dirty_mtx_data),
|
||||
&(astats->astats.decay_dirty_mtx_data));
|
||||
malloc_mutex_prof_merge(&(sdstats->astats.decay_muzzy_mtx_data),
|
||||
&(astats->astats.decay_muzzy_mtx_data));
|
||||
malloc_mutex_prof_merge(&(sdstats->astats.tcache_list_mtx_data),
|
||||
&(astats->astats.tcache_list_mtx_data));
|
||||
|
||||
if (!destroyed) {
|
||||
accum_atomic_zu(&sdstats->astats.base,
|
||||
@ -2479,25 +2497,20 @@ CTL_RO_CGEN(config_stats, stats_##n##_max_num_thds, \
|
||||
GLOBAL_PROF_MUTEXES
|
||||
#undef MTX
|
||||
|
||||
/* arena->bins[j].lock */
|
||||
/* tcache bin mutex */
|
||||
RO_MUTEX_CTL_GEN(arenas_i_bins_j_mutex,
|
||||
arenas_i(mib[2])->astats->bstats[mib[4]].mutex_data)
|
||||
|
||||
/* Per arena mutexes */
|
||||
#define ARENAS_ASTATS_MUTEX_CTL_GEN(l, d) \
|
||||
RO_MUTEX_CTL_GEN(arenas_i_mutexes_##l, arenas_i(mib[2])->astats->astats.d)
|
||||
/* arena->large_mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(large, large_mtx_data)
|
||||
/* arena->extent_freelist_mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(extent_freelist, extent_freelist_mtx_data)
|
||||
/* arena->extents_cached.mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(extents_cached, extents_cached_mtx_data)
|
||||
/* arena->extents_retained.mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(extents_dirty, extents_dirty_mtx_data)
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(extents_muzzy, extents_muzzy_mtx_data)
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(extents_retained, extents_retained_mtx_data)
|
||||
/* arena->decay.mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(decay, decay_mtx_data)
|
||||
/* arena->tcache_ql_mtx */
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(tcache, tcache_mtx_data)
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(decay_dirty, decay_dirty_mtx_data)
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(decay_muzzy, decay_muzzy_mtx_data)
|
||||
ARENAS_ASTATS_MUTEX_CTL_GEN(tcache_list, tcache_list_mtx_data)
|
||||
#undef ARENAS_ASTATS_MUTEX_CTL_GEN
|
||||
#undef RO_MUTEX_CTL_GEN
|
||||
|
||||
@ -2533,9 +2546,11 @@ stats_mutexes_reset_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
|
||||
}
|
||||
MUTEX_PROF_RESET(arena->large_mtx);
|
||||
MUTEX_PROF_RESET(arena->extent_freelist_mtx);
|
||||
MUTEX_PROF_RESET(arena->extents_cached.mtx);
|
||||
MUTEX_PROF_RESET(arena->extents_dirty.mtx);
|
||||
MUTEX_PROF_RESET(arena->extents_muzzy.mtx);
|
||||
MUTEX_PROF_RESET(arena->extents_retained.mtx);
|
||||
MUTEX_PROF_RESET(arena->decay.mtx);
|
||||
MUTEX_PROF_RESET(arena->decay_dirty.mtx);
|
||||
MUTEX_PROF_RESET(arena->decay_muzzy.mtx);
|
||||
if (config_tcache) {
|
||||
MUTEX_PROF_RESET(arena->tcache_ql_mtx);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user