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

Fix large object stats collection bugs.

Browse Source
This commit is contained in:
Jason Evans 2010-01-31 03:49:35 -08:00
parent a0bf242230
commit 990d10cefb
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
jemalloc/src/jemalloc_arena.c
View File

@ -1614,9 +1614,9 @@ arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr)
malloc_mutex_lock(&arena->lock); malloc_mutex_lock(&arena->lock);
#ifdef JEMALLOC_FILL #ifdef JEMALLOC_FILL
#ifndef JEMALLOC_STATS # ifndef JEMALLOC_STATS
if (opt_junk) if (opt_junk)
#endif # endif
#endif #endif
{ {
#if (defined(JEMALLOC_FILL) || defined(JEMALLOC_STATS)) #if (defined(JEMALLOC_FILL) || defined(JEMALLOC_STATS))
@ -1626,19 +1626,17 @@ arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr)
#endif #endif
#ifdef JEMALLOC_FILL #ifdef JEMALLOC_FILL
#ifdef JEMALLOC_STATS # ifdef JEMALLOC_STATS
if (opt_junk) if (opt_junk)
#endif # endif
memset(ptr, 0x5a, size); memset(ptr, 0x5a, size);
#endif #endif
#ifdef JEMALLOC_STATS #ifdef JEMALLOC_STATS
arena->stats.ndalloc_large++;
arena->stats.allocated_large -= size; arena->stats.allocated_large -= size;
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns--; arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns--;
#endif #endif
} }
#ifdef JEMALLOC_STATS
arena->stats.ndalloc_large++;
#endif
arena_run_dalloc(arena, (arena_run_t *)ptr, true); arena_run_dalloc(arena, (arena_run_t *)ptr, true);
malloc_mutex_unlock(&arena->lock); malloc_mutex_unlock(&arena->lock);
@ -1659,15 +1657,19 @@ arena_ralloc_large_shrink(arena_t *arena, arena_chunk_t *chunk, void *ptr,
arena_run_trim_tail(arena, chunk, (arena_run_t *)ptr, oldsize, size, arena_run_trim_tail(arena, chunk, (arena_run_t *)ptr, oldsize, size,
true); true);
#ifdef JEMALLOC_STATS #ifdef JEMALLOC_STATS
arena->stats.allocated_large -= oldsize - size; arena->stats.ndalloc_large++;
arena->stats.lstats[size >> PAGE_SHIFT].nrequests++; arena->stats.allocated_large -= oldsize;
arena->stats.lstats[size >> PAGE_SHIFT].curruns++; arena->stats.lstats[(oldsize >> PAGE_SHIFT) - 1].curruns--;
if (arena->stats.lstats[size >> PAGE_SHIFT].curruns >
arena->stats.lstats[size >> PAGE_SHIFT].highruns) { arena->stats.nmalloc_large++;
arena->stats.lstats[size >> PAGE_SHIFT].highruns = arena->stats.allocated_large += size;
arena->stats.lstats[size >> PAGE_SHIFT].curruns; arena->stats.lstats[(size >> PAGE_SHIFT) - 1].nrequests++;
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns++;
if (arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns >
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].highruns) {
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].highruns =
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns;
} }
arena->stats.lstats[oldsize >> PAGE_SHIFT].curruns--;
#endif #endif
malloc_mutex_unlock(&arena->lock); malloc_mutex_unlock(&arena->lock);
} }
@ -1702,15 +1704,19 @@ arena_ralloc_large_grow(arena_t *arena, arena_chunk_t *chunk, void *ptr,
CHUNK_MAP_ALLOCATED; CHUNK_MAP_ALLOCATED;
#ifdef JEMALLOC_STATS #ifdef JEMALLOC_STATS
arena->stats.allocated_large += size - oldsize; arena->stats.ndalloc_large++;
arena->stats.lstats[size >> PAGE_SHIFT].nrequests++; arena->stats.allocated_large -= oldsize;
arena->stats.lstats[size >> PAGE_SHIFT].curruns++; arena->stats.lstats[(oldsize >> PAGE_SHIFT) - 1].curruns--;
if (arena->stats.lstats[size >> PAGE_SHIFT].curruns >
arena->stats.lstats[size >> PAGE_SHIFT].highruns) { arena->stats.nmalloc_large++;
arena->stats.lstats[size >> PAGE_SHIFT].highruns = arena->stats.allocated_large += size;
arena->stats.lstats[size >> PAGE_SHIFT].curruns; arena->stats.lstats[(size >> PAGE_SHIFT) - 1].nrequests++;
} arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns++;
arena->stats.lstats[oldsize >> PAGE_SHIFT].curruns--; if (arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns >
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].highruns) {
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].highruns =
arena->stats.lstats[(size >> PAGE_SHIFT) - 1].curruns;
}
#endif #endif
malloc_mutex_unlock(&arena->lock); malloc_mutex_unlock(&arena->lock);
return (false); return (false);