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

Fix arena reset effects on large/huge stats.

Browse Source 
Reset large curruns to 0 during arena reset.

Do not increase huge ndalloc stats during arena reset.
This commit is contained in:
Jason Evans 2016-04-25 13:26:54 -07:00
parent 2fe64d237c
commit 7e6749595a
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/arena.c
View File

@ -854,6 +854,17 @@ arena_huge_dalloc_stats_update(arena_t *arena, size_t usize)
arena->stats.hstats[index].curhchunks--; arena->stats.hstats[index].curhchunks--;
} }
static void
arena_huge_reset_stats_cancel(arena_t *arena, size_t usize)
{
szind_t index = size2index(usize) - nlclasses - NBINS;
cassert(config_stats);
arena->stats.ndalloc_huge++;
arena->stats.hstats[index].ndalloc--;
}
static void static void
arena_huge_dalloc_stats_update_undo(arena_t *arena, size_t usize) arena_huge_dalloc_stats_update_undo(arena_t *arena, size_t usize)
{ {
@ -1884,22 +1895,30 @@ arena_reset(tsd_t *tsd, arena_t *arena)
} }
} }
/* Reset curruns for large size classes. */
if (config_stats) {
for (i = 0; i < nlclasses; i++)
arena->stats.lstats[i].curruns = 0;
}
/* Huge allocations. */ /* Huge allocations. */
malloc_mutex_lock(tsd, &arena->huge_mtx); malloc_mutex_lock(tsd, &arena->huge_mtx);
for (node = ql_last(&arena->huge, ql_link); node != NULL; node = for (node = ql_last(&arena->huge, ql_link); node != NULL; node =
ql_last(&arena->huge, ql_link)) { ql_last(&arena->huge, ql_link)) {
void *ptr = extent_node_addr_get(node); void *ptr = extent_node_addr_get(node);
size_t usize;
malloc_mutex_unlock(tsd, &arena->huge_mtx); malloc_mutex_unlock(tsd, &arena->huge_mtx);
/* Remove huge allocation from prof sample set. */ if (config_stats || (config_prof && opt_prof))
if (config_prof && opt_prof) {
size_t usize;
usize = isalloc(tsd, ptr, config_prof); usize = isalloc(tsd, ptr, config_prof);
/* Remove huge allocation from prof sample set. */
if (config_prof && opt_prof)
prof_free(tsd, ptr, usize); prof_free(tsd, ptr, usize);
}
huge_dalloc(tsd, ptr); huge_dalloc(tsd, ptr);
malloc_mutex_lock(tsd, &arena->huge_mtx); malloc_mutex_lock(tsd, &arena->huge_mtx);
/* Cancel out unwanted effects on stats. */
if (config_stats)
arena_huge_reset_stats_cancel(arena, usize);
} }
malloc_mutex_unlock(tsd, &arena->huge_mtx); malloc_mutex_unlock(tsd, &arena->huge_mtx);