project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Profile per arena base mutex, instead of just a0.

Browse Source
This commit is contained in:
Qi Wang 2017-03-22 01:49:56 -07:00 committed by Qi Wang
parent d3fde1c124
commit 362e356675
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/jemalloc/internal/ctl_types.h
View File

@ -2,7 +2,6 @@
#define JEMALLOC_INTERNAL_CTL_TYPES_H #define JEMALLOC_INTERNAL_CTL_TYPES_H
#define GLOBAL_PROF_MUTEXES \ #define GLOBAL_PROF_MUTEXES \
OP(base) \
OP(ctl) \ OP(ctl) \
OP(prof) OP(prof)
@ -21,6 +20,7 @@ typedef enum {
OP(extents_retained) \ OP(extents_retained) \
OP(decay_dirty) \ OP(decay_dirty) \
OP(decay_muzzy) \ OP(decay_muzzy) \
OP(base) \
OP(tcache_list) OP(tcache_list)
typedef enum { typedef enum {

2
src/arena.c
View File

@ -318,6 +318,8 @@ arena_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
arena_prof_mutex_decay_dirty) arena_prof_mutex_decay_dirty)
READ_ARENA_MUTEX_PROF_DATA(decay_muzzy.mtx, READ_ARENA_MUTEX_PROF_DATA(decay_muzzy.mtx,
arena_prof_mutex_decay_muzzy) arena_prof_mutex_decay_muzzy)
READ_ARENA_MUTEX_PROF_DATA(base->mtx,
arena_prof_mutex_base)
#undef READ_ARENA_MUTEX_PROF_DATA #undef READ_ARENA_MUTEX_PROF_DATA
for (szind_t i = 0; i < NBINS; i++) { for (szind_t i = 0; i < NBINS; i++) {

9
src/ctl.c
View File

@ -912,8 +912,6 @@ ctl_refresh(tsdn_t *tsdn) {
malloc_mutex_prof_read(tsdn, &ctl_stats->mutex_prof_data[i], &mtx); \ malloc_mutex_prof_read(tsdn, &ctl_stats->mutex_prof_data[i], &mtx); \
malloc_mutex_unlock(tsdn, &mtx); malloc_mutex_unlock(tsdn, &mtx);
READ_GLOBAL_MUTEX_PROF_DATA(global_prof_mutex_base,
b0get()->mtx);
if (config_prof && opt_prof) { if (config_prof && opt_prof) {
READ_GLOBAL_MUTEX_PROF_DATA(global_prof_mutex_prof, READ_GLOBAL_MUTEX_PROF_DATA(global_prof_mutex_prof,
bt2gctx_mtx); bt2gctx_mtx);
@ -2460,12 +2458,12 @@ stats_mutexes_reset_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
malloc_mutex_prof_data_reset(tsdn, &mtx); \ malloc_mutex_prof_data_reset(tsdn, &mtx); \
malloc_mutex_unlock(tsdn, &mtx); malloc_mutex_unlock(tsdn, &mtx);
/* Global mutexes: base, prof and ctl. */ /* Global mutexes: ctl and prof. */
MUTEX_PROF_RESET(b0get()->mtx); MUTEX_PROF_RESET(ctl_mtx);
if (config_prof && opt_prof) { if (config_prof && opt_prof) {
MUTEX_PROF_RESET(bt2gctx_mtx); MUTEX_PROF_RESET(bt2gctx_mtx);
} }
MUTEX_PROF_RESET(ctl_mtx);
/* Per arena mutexes. */ /* Per arena mutexes. */
unsigned n = narenas_total_get(); unsigned n = narenas_total_get();
@ -2485,6 +2483,7 @@ stats_mutexes_reset_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
if (config_tcache) { if (config_tcache) {
MUTEX_PROF_RESET(arena->tcache_ql_mtx); MUTEX_PROF_RESET(arena->tcache_ql_mtx);
} }
MUTEX_PROF_RESET(arena->base->mtx);
for (szind_t i = 0; i < NBINS; i++) { for (szind_t i = 0; i < NBINS; i++) {
arena_bin_t *bin = &arena->bins[i]; arena_bin_t *bin = &arena->bins[i];