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

malloc_stats_print() fixes/cleanups.

Browse Source 
Fix and clean up various malloc_stats_print() issues caused by
0ba5b9b618 (Add "J" (JSON) support to
malloc_stats_print().).
This commit is contained in:
Jason Evans 2016-11-01 15:26:35 -07:00
parent 2a2d1b6e86
commit 7b0a8b74f0
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/stats.c
View File

@ -73,8 +73,7 @@ stats_arena_bins_print(void (*write_cb)(void *, const char *), void *cbopaque,
CTL_M2_M4_GET("stats.arenas.0.bins.0.nslabs", i, j, &nslabs, CTL_M2_M4_GET("stats.arenas.0.bins.0.nslabs", i, j, &nslabs,
uint64_t); uint64_t);
in_gap_prev = in_gap; in_gap_prev = in_gap;
if (nslabs == 0) in_gap = (nslabs == 0);
in_gap = true;
if (!json && in_gap_prev && !in_gap) { if (!json && in_gap_prev && !in_gap) {
malloc_cprintf(write_cb, cbopaque, malloc_cprintf(write_cb, cbopaque,
@ -211,8 +210,7 @@ stats_arena_lextents_print(void (*write_cb)(void *, const char *),
CTL_M2_M4_GET("stats.arenas.0.lextents.0.nrequests", i, j, CTL_M2_M4_GET("stats.arenas.0.lextents.0.nrequests", i, j,
&nrequests, uint64_t); &nrequests, uint64_t);
in_gap_prev = in_gap; in_gap_prev = in_gap;
if (nrequests == 0) in_gap = (nrequests == 0);
in_gap = true;
if (!json && in_gap_prev && !in_gap) { if (!json && in_gap_prev && !in_gap) {
malloc_cprintf(write_cb, cbopaque, malloc_cprintf(write_cb, cbopaque,
@ -314,8 +312,7 @@ stats_arena_print(void (*write_cb)(void *, const char *), void *cbopaque,
} else { } else {
malloc_cprintf(write_cb, cbopaque, malloc_cprintf(write_cb, cbopaque,
"purging: dirty: %zu, sweeps: %"FMTu64", madvises: %"FMTu64 "purging: dirty: %zu, sweeps: %"FMTu64", madvises: %"FMTu64
", ""purged: %"FMTu64"\n", pdirty, npurge, nmadvise, ", purged: %"FMTu64"\n", pdirty, npurge, nmadvise, purged);
purged);
} }
CTL_M2_GET("stats.arenas.0.small.allocated", i, &small_allocated, CTL_M2_GET("stats.arenas.0.small.allocated", i, &small_allocated,
@ -538,16 +535,6 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
" opt."#n": %u\n", uv); \ " opt."#n": %u\n", uv); \
} \ } \
} }
#define OPT_WRITE_SIZE_T(n) \
if (je_mallctl("opt."#n, (void *)&sv, &ssz, NULL, 0) == 0) { \
if (json) { \
malloc_cprintf(write_cb, cbopaque, \
"\t\t\t\""#n"\": %zu%s\n", sv, (c)); \
} else { \
malloc_cprintf(write_cb, cbopaque, \
" opt."#n": %zu\n", sv); \
} \
}
#define OPT_WRITE_SSIZE_T(n, c) \ #define OPT_WRITE_SSIZE_T(n, c) \
if (je_mallctl("opt."#n, (void *)&ssv, &sssz, NULL, 0) == 0) { \ if (je_mallctl("opt."#n, (void *)&ssv, &sssz, NULL, 0) == 0) { \
if (json) { \ if (json) { \
@ -593,7 +580,6 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
OPT_WRITE_BOOL(abort, ",") OPT_WRITE_BOOL(abort, ",")
OPT_WRITE_CHAR_P(dss, ",") OPT_WRITE_CHAR_P(dss, ",")
OPT_WRITE_UNSIGNED(narenas, ",") OPT_WRITE_UNSIGNED(narenas, ",")
OPT_WRITE_CHAR_P(purge, ",")
OPT_WRITE_SSIZE_T_MUTABLE(decay_time, arenas.decay_time, ",") OPT_WRITE_SSIZE_T_MUTABLE(decay_time, arenas.decay_time, ",")
OPT_WRITE_CHAR_P(junk, ",") OPT_WRITE_CHAR_P(junk, ",")
OPT_WRITE_BOOL(zero, ",") OPT_WRITE_BOOL(zero, ",")
@ -625,7 +611,6 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
#undef OPT_WRITE_BOOL #undef OPT_WRITE_BOOL
#undef OPT_WRITE_BOOL_MUTABLE #undef OPT_WRITE_BOOL_MUTABLE
#undef OPT_WRITE_SIZE_T
#undef OPT_WRITE_SSIZE_T #undef OPT_WRITE_SSIZE_T
#undef OPT_WRITE_CHAR_P #undef OPT_WRITE_CHAR_P