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

Fix {allocated,nmalloc,ndalloc,nrequests}_large stats regression.

Browse Source 
This fixes a regression introduced by
d433471f58 (Derive
{allocated,nmalloc,ndalloc,nrequests}_large stats.).
This commit is contained in:
Jason Evans 2017-02-25 14:10:05 -08:00
parent 079b8bee37
commit 472fef2e12
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ struct arena_stats_s {
#endif #endif
/* Number of bytes currently mapped, excluding retained memory. */ /* Number of bytes currently mapped, excluding retained memory. */
size_t mapped; /* Derived. */ size_t mapped; /* Partially derived. */
/* /*
* Number of bytes currently retained as a side effect of munmap() being * Number of bytes currently retained as a side effect of munmap() being

14
src/arena.c
View File

@ -192,19 +192,7 @@ arena_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
astats->internal += arena_internal_get(arena); astats->internal += arena_internal_get(arena);
astats->resident += base_resident + (((atomic_read_zu(&arena->nactive) + astats->resident += base_resident + (((atomic_read_zu(&arena->nactive) +
extents_npages_get(&arena->extents_cached)) << LG_PAGE)); extents_npages_get(&arena->extents_cached)) << LG_PAGE));
astats->allocated_large += arena_stats_read_zu(tsdn, &arena->stats,
&arena->stats.allocated_large);
astats->nmalloc_large += arena_stats_read_u64(tsdn, &arena->stats,
&arena->stats.nmalloc_large);
astats->ndalloc_large += arena_stats_read_u64(tsdn, &arena->stats,
&arena->stats.ndalloc_large);
astats->nrequests_large += arena_stats_read_u64(tsdn, &arena->stats,
&arena->stats.nrequests_large);
astats->allocated_large = 0;
astats->nmalloc_large = 0;
astats->ndalloc_large = 0;
astats->nrequests_large = 0;
for (szind_t i = 0; i < NSIZES - NBINS; i++) { for (szind_t i = 0; i < NSIZES - NBINS; i++) {
uint64_t nmalloc = arena_stats_read_u64(tsdn, &arena->stats, uint64_t nmalloc = arena_stats_read_u64(tsdn, &arena->stats,
&arena->stats.lstats[i].nmalloc); &arena->stats.lstats[i].nmalloc);
@ -224,7 +212,7 @@ arena_stats_merge(tsdn_t *tsdn, arena_t *arena, unsigned *nthreads,
size_t curlextents = arena_stats_read_zu(tsdn, size_t curlextents = arena_stats_read_zu(tsdn,
&arena->stats, &arena->stats.lstats[i].curlextents); &arena->stats, &arena->stats.lstats[i].curlextents);
lstats[i].curlextents += curlextents; lstats[i].curlextents += curlextents;
astats->allocated_large += curlextents * index2size(i); astats->allocated_large += curlextents * index2size(NBINS + i);
} }
arena_stats_unlock(tsdn, &arena->stats); arena_stats_unlock(tsdn, &arena->stats);