Stats printing: convert config and opt output to use emitter.
This is a step along the path towards using the emitter for all stats output.
This commit is contained in:
David Goldblatt
David Goldblatt
parent
b646f89173
commit
4a335e0c6f
283
src/stats.c
283
src/stats.c
@ -668,14 +668,21 @@ stats_arena_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
stats_general_print(emitter_t *emitter, bool more) {
|
||||||
bool json, bool more) {
|
/*
|
||||||
|
* These should eventually be deleted; they are useful in converting
|
||||||
|
* from manual to emitter-based stats output, though.
|
||||||
|
*/
|
||||||
|
void (*write_cb)(void *, const char *) = emitter->write_cb;
|
||||||
|
void *cbopaque = emitter->cbopaque;
|
||||||
|
bool json = (emitter->output == emitter_output_json);
|
||||||
|
|
||||||
const char *cpv;
|
const char *cpv;
|
||||||
bool bv;
|
bool bv, bv2;
|
||||||
unsigned uv;
|
unsigned uv;
|
||||||
uint32_t u32v;
|
uint32_t u32v;
|
||||||
uint64_t u64v;
|
uint64_t u64v;
|
||||||
ssize_t ssv;
|
ssize_t ssv, ssv2;
|
||||||
size_t sv, bsz, usz, ssz, sssz, cpsz;
|
size_t sv, bsz, usz, ssz, sssz, cpsz;
|
||||||
|
|
||||||
bsz = sizeof(bool);
|
bsz = sizeof(bool);
|
||||||
@ -685,186 +692,104 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
|||||||
cpsz = sizeof(const char *);
|
cpsz = sizeof(const char *);
|
||||||
|
|
||||||
CTL_GET("version", &cpv, const char *);
|
CTL_GET("version", &cpv, const char *);
|
||||||
if (json) {
|
emitter_kv(emitter, "version", "Version", emitter_type_string, &cpv);
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
|
||||||
"\t\t\"version\": \"%s\",\n", cpv);
|
|
||||||
} else {
|
|
||||||
malloc_cprintf(write_cb, cbopaque, "Version: %s\n", cpv);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* config. */
|
/* config. */
|
||||||
#define CONFIG_WRITE_BOOL_JSON(n, c) \
|
emitter_dict_begin(emitter, "config", "Build-time option settings");
|
||||||
if (json) { \
|
#define CONFIG_WRITE_BOOL(name) \
|
||||||
CTL_GET("config."#n, &bv, bool); \
|
do { \
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
CTL_GET("config."#name, &bv, bool); \
|
||||||
"\t\t\t\""#n"\": %s%s\n", bv ? "true" : "false", \
|
emitter_kv(emitter, #name, "config."#name, \
|
||||||
(c)); \
|
emitter_type_bool, &bv); \
|
||||||
}
|
} while (0)
|
||||||
|
|
||||||
if (json) {
|
CONFIG_WRITE_BOOL(cache_oblivious);
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
CONFIG_WRITE_BOOL(debug);
|
||||||
"\t\t\"config\": {\n");
|
CONFIG_WRITE_BOOL(fill);
|
||||||
}
|
CONFIG_WRITE_BOOL(lazy_lock);
|
||||||
|
emitter_kv(emitter, "malloc_conf", "config.malloc_conf",
|
||||||
|
emitter_type_string, &config_malloc_conf);
|
||||||
|
|
||||||
CONFIG_WRITE_BOOL_JSON(cache_oblivious, ",")
|
CONFIG_WRITE_BOOL(prof);
|
||||||
|
CONFIG_WRITE_BOOL(prof_libgcc);
|
||||||
CTL_GET("config.debug", &bv, bool);
|
CONFIG_WRITE_BOOL(prof_libunwind);
|
||||||
if (json) {
|
CONFIG_WRITE_BOOL(stats);
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
CONFIG_WRITE_BOOL(utrace);
|
||||||
"\t\t\t\"debug\": %s,\n", bv ? "true" : "false");
|
CONFIG_WRITE_BOOL(xmalloc);
|
||||||
} else {
|
#undef CONFIG_WRITE_BOOL
|
||||||
malloc_cprintf(write_cb, cbopaque, "Assertions %s\n",
|
emitter_dict_end(emitter); /* Close "config" dict. */
|
||||||
bv ? "enabled" : "disabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
CONFIG_WRITE_BOOL_JSON(fill, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(lazy_lock, ",")
|
|
||||||
|
|
||||||
if (json) {
|
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
|
||||||
"\t\t\t\"malloc_conf\": \"%s\",\n",
|
|
||||||
config_malloc_conf);
|
|
||||||
} else {
|
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
|
||||||
"config.malloc_conf: \"%s\"\n", config_malloc_conf);
|
|
||||||
}
|
|
||||||
|
|
||||||
CONFIG_WRITE_BOOL_JSON(prof, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(prof_libgcc, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(prof_libunwind, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(stats, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(utrace, ",")
|
|
||||||
CONFIG_WRITE_BOOL_JSON(xmalloc, "")
|
|
||||||
|
|
||||||
if (json) {
|
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
|
||||||
"\t\t},\n");
|
|
||||||
}
|
|
||||||
#undef CONFIG_WRITE_BOOL_JSON
|
|
||||||
|
|
||||||
/* opt. */
|
/* opt. */
|
||||||
#define OPT_WRITE_BOOL(n, c) \
|
#define OPT_WRITE(name, var, size, emitter_type) \
|
||||||
if (je_mallctl("opt."#n, (void *)&bv, &bsz, NULL, 0) == 0) { \
|
if (je_mallctl("opt."#name, (void *)&var, &size, NULL, 0) == \
|
||||||
if (json) { \
|
0) { \
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
emitter_kv(emitter, #name, "opt."#name, emitter_type, \
|
||||||
"\t\t\t\""#n"\": %s%s\n", bv ? "true" : \
|
&var); \
|
||||||
"false", (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": %s\n", bv ? "true" : "false"); \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
#define OPT_WRITE_BOOL_MUTABLE(n, m, c) { \
|
|
||||||
bool bv2; \
|
|
||||||
if (je_mallctl("opt."#n, (void *)&bv, &bsz, NULL, 0) == 0 && \
|
|
||||||
je_mallctl(#m, (void *)&bv2, &bsz, NULL, 0) == 0) { \
|
|
||||||
if (json) { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
"\t\t\t\""#n"\": %s%s\n", bv ? "true" : \
|
|
||||||
"false", (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": %s ("#m": %s)\n", bv ? "true" \
|
|
||||||
: "false", bv2 ? "true" : "false"); \
|
|
||||||
} \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
#define OPT_WRITE_UNSIGNED(n, c) \
|
|
||||||
if (je_mallctl("opt."#n, (void *)&uv, &usz, NULL, 0) == 0) { \
|
|
||||||
if (json) { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
"\t\t\t\""#n"\": %u%s\n", uv, (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": %u\n", uv); \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
#define OPT_WRITE_SSIZE_T(n, c) \
|
|
||||||
if (je_mallctl("opt."#n, (void *)&ssv, &sssz, NULL, 0) == 0) { \
|
|
||||||
if (json) { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
"\t\t\t\""#n"\": %zd%s\n", ssv, (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": %zd\n", ssv); \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
#define OPT_WRITE_SSIZE_T_MUTABLE(n, m, c) { \
|
|
||||||
ssize_t ssv2; \
|
|
||||||
if (je_mallctl("opt."#n, (void *)&ssv, &sssz, NULL, 0) == 0 && \
|
|
||||||
je_mallctl(#m, (void *)&ssv2, &sssz, NULL, 0) == 0) { \
|
|
||||||
if (json) { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
"\t\t\t\""#n"\": %zd%s\n", ssv, (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": %zd ("#m": %zd)\n", \
|
|
||||||
ssv, ssv2); \
|
|
||||||
} \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
#define OPT_WRITE_CHAR_P(n, c) \
|
|
||||||
if (je_mallctl("opt."#n, (void *)&cpv, &cpsz, NULL, 0) == 0) { \
|
|
||||||
if (json) { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
"\t\t\t\""#n"\": \"%s\"%s\n", cpv, (c)); \
|
|
||||||
} else { \
|
|
||||||
malloc_cprintf(write_cb, cbopaque, \
|
|
||||||
" opt."#n": \"%s\"\n", cpv); \
|
|
||||||
} \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (json) {
|
#define OPT_WRITE_MUTABLE(name, var1, var2, size, emitter_type, \
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
altname) \
|
||||||
"\t\t\"opt\": {\n");
|
if (je_mallctl("opt."#name, (void *)&var1, &size, NULL, 0) == \
|
||||||
} else {
|
0 && je_mallctl(#altname, (void *)&var2, &size, NULL, 0) \
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
== 0) { \
|
||||||
"Run-time option settings:\n");
|
emitter_kv_note(emitter, #name, "opt."#name, \
|
||||||
}
|
emitter_type, &var1, #altname, emitter_type, \
|
||||||
OPT_WRITE_BOOL(abort, ",")
|
&var2); \
|
||||||
OPT_WRITE_BOOL(abort_conf, ",")
|
|
||||||
OPT_WRITE_BOOL(retain, ",")
|
|
||||||
OPT_WRITE_CHAR_P(dss, ",")
|
|
||||||
OPT_WRITE_UNSIGNED(narenas, ",")
|
|
||||||
OPT_WRITE_CHAR_P(percpu_arena, ",")
|
|
||||||
OPT_WRITE_CHAR_P(metadata_thp, ",")
|
|
||||||
OPT_WRITE_BOOL_MUTABLE(background_thread, background_thread, ",")
|
|
||||||
OPT_WRITE_SSIZE_T_MUTABLE(dirty_decay_ms, arenas.dirty_decay_ms, ",")
|
|
||||||
OPT_WRITE_SSIZE_T_MUTABLE(muzzy_decay_ms, arenas.muzzy_decay_ms, ",")
|
|
||||||
OPT_WRITE_UNSIGNED(lg_extent_max_active_fit, ",")
|
|
||||||
OPT_WRITE_CHAR_P(junk, ",")
|
|
||||||
OPT_WRITE_BOOL(zero, ",")
|
|
||||||
OPT_WRITE_BOOL(utrace, ",")
|
|
||||||
OPT_WRITE_BOOL(xmalloc, ",")
|
|
||||||
OPT_WRITE_BOOL(tcache, ",")
|
|
||||||
OPT_WRITE_SSIZE_T(lg_tcache_max, ",")
|
|
||||||
OPT_WRITE_CHAR_P(thp, ",")
|
|
||||||
OPT_WRITE_BOOL(prof, ",")
|
|
||||||
OPT_WRITE_CHAR_P(prof_prefix, ",")
|
|
||||||
OPT_WRITE_BOOL_MUTABLE(prof_active, prof.active, ",")
|
|
||||||
OPT_WRITE_BOOL_MUTABLE(prof_thread_active_init, prof.thread_active_init,
|
|
||||||
",")
|
|
||||||
OPT_WRITE_SSIZE_T_MUTABLE(lg_prof_sample, prof.lg_sample, ",")
|
|
||||||
OPT_WRITE_BOOL(prof_accum, ",")
|
|
||||||
OPT_WRITE_SSIZE_T(lg_prof_interval, ",")
|
|
||||||
OPT_WRITE_BOOL(prof_gdump, ",")
|
|
||||||
OPT_WRITE_BOOL(prof_final, ",")
|
|
||||||
OPT_WRITE_BOOL(prof_leak, ",")
|
|
||||||
OPT_WRITE_BOOL(stats_print, ",")
|
|
||||||
if (json || opt_stats_print) {
|
|
||||||
/*
|
|
||||||
* stats_print_opts is always emitted for JSON, so as long as it
|
|
||||||
* comes last it's safe to unconditionally omit the comma here
|
|
||||||
* (rather than having to conditionally omit it elsewhere
|
|
||||||
* depending on configuration).
|
|
||||||
*/
|
|
||||||
OPT_WRITE_CHAR_P(stats_print_opts, "")
|
|
||||||
}
|
|
||||||
if (json) {
|
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
|
||||||
"\t\t},\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define OPT_WRITE_BOOL(name) OPT_WRITE(name, bv, bsz, emitter_type_bool)
|
||||||
|
#define OPT_WRITE_BOOL_MUTABLE(name, altname) \
|
||||||
|
OPT_WRITE_MUTABLE(name, bv, bv2, bsz, emitter_type_bool, altname)
|
||||||
|
|
||||||
|
#define OPT_WRITE_UNSIGNED(name) \
|
||||||
|
OPT_WRITE(name, uv, usz, emitter_type_unsigned)
|
||||||
|
|
||||||
|
#define OPT_WRITE_SSIZE_T(name) \
|
||||||
|
OPT_WRITE(name, ssv, sssz, emitter_type_ssize)
|
||||||
|
#define OPT_WRITE_SSIZE_T_MUTABLE(name, altname) \
|
||||||
|
OPT_WRITE_MUTABLE(name, ssv, ssv2, sssz, emitter_type_ssize, \
|
||||||
|
altname)
|
||||||
|
|
||||||
|
#define OPT_WRITE_CHAR_P(name) \
|
||||||
|
OPT_WRITE(name, cpv, cpsz, emitter_type_string)
|
||||||
|
|
||||||
|
emitter_dict_begin(emitter, "opt", "Run-time option settings");
|
||||||
|
|
||||||
|
OPT_WRITE_BOOL(abort)
|
||||||
|
OPT_WRITE_BOOL(abort_conf)
|
||||||
|
OPT_WRITE_BOOL(retain)
|
||||||
|
OPT_WRITE_CHAR_P(dss)
|
||||||
|
OPT_WRITE_UNSIGNED(narenas)
|
||||||
|
OPT_WRITE_CHAR_P(percpu_arena)
|
||||||
|
OPT_WRITE_CHAR_P(metadata_thp)
|
||||||
|
OPT_WRITE_BOOL_MUTABLE(background_thread, background_thread)
|
||||||
|
OPT_WRITE_SSIZE_T_MUTABLE(dirty_decay_ms, arenas.dirty_decay_ms)
|
||||||
|
OPT_WRITE_SSIZE_T_MUTABLE(muzzy_decay_ms, arenas.muzzy_decay_ms)
|
||||||
|
OPT_WRITE_UNSIGNED(lg_extent_max_active_fit)
|
||||||
|
OPT_WRITE_CHAR_P(junk)
|
||||||
|
OPT_WRITE_BOOL(zero)
|
||||||
|
OPT_WRITE_BOOL(utrace)
|
||||||
|
OPT_WRITE_BOOL(xmalloc)
|
||||||
|
OPT_WRITE_BOOL(tcache)
|
||||||
|
OPT_WRITE_SSIZE_T(lg_tcache_max)
|
||||||
|
OPT_WRITE_CHAR_P(thp)
|
||||||
|
OPT_WRITE_BOOL(prof)
|
||||||
|
OPT_WRITE_CHAR_P(prof_prefix)
|
||||||
|
OPT_WRITE_BOOL_MUTABLE(prof_active, prof.active)
|
||||||
|
OPT_WRITE_BOOL_MUTABLE(prof_thread_active_init, prof.thread_active_init)
|
||||||
|
OPT_WRITE_SSIZE_T_MUTABLE(lg_prof_sample, prof.lg_sample)
|
||||||
|
OPT_WRITE_BOOL(prof_accum)
|
||||||
|
OPT_WRITE_SSIZE_T(lg_prof_interval)
|
||||||
|
OPT_WRITE_BOOL(prof_gdump)
|
||||||
|
OPT_WRITE_BOOL(prof_final)
|
||||||
|
OPT_WRITE_BOOL(prof_leak)
|
||||||
|
OPT_WRITE_BOOL(stats_print)
|
||||||
|
OPT_WRITE_CHAR_P(stats_print_opts)
|
||||||
|
|
||||||
|
emitter_dict_end(emitter);
|
||||||
|
|
||||||
|
#undef OPT_WRITE
|
||||||
|
#undef OPT_WRITE_MUTABLE
|
||||||
#undef OPT_WRITE_BOOL
|
#undef OPT_WRITE_BOOL
|
||||||
#undef OPT_WRITE_BOOL_MUTABLE
|
#undef OPT_WRITE_BOOL_MUTABLE
|
||||||
#undef OPT_WRITE_UNSIGNED
|
#undef OPT_WRITE_UNSIGNED
|
||||||
@ -872,6 +797,11 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
|||||||
#undef OPT_WRITE_SSIZE_T_MUTABLE
|
#undef OPT_WRITE_SSIZE_T_MUTABLE
|
||||||
#undef OPT_WRITE_CHAR_P
|
#undef OPT_WRITE_CHAR_P
|
||||||
|
|
||||||
|
if (json) {
|
||||||
|
malloc_cprintf(write_cb, cbopaque,
|
||||||
|
",\n");
|
||||||
|
}
|
||||||
|
|
||||||
/* arenas. */
|
/* arenas. */
|
||||||
if (json) {
|
if (json) {
|
||||||
malloc_cprintf(write_cb, cbopaque,
|
malloc_cprintf(write_cb, cbopaque,
|
||||||
@ -1298,11 +1228,8 @@ stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
|||||||
emitter_table_printf(&emitter, "___ Begin jemalloc statistics ___\n");
|
emitter_table_printf(&emitter, "___ Begin jemalloc statistics ___\n");
|
||||||
emitter_json_dict_begin(&emitter, "jemalloc");
|
emitter_json_dict_begin(&emitter, "jemalloc");
|
||||||
|
|
||||||
if (json) {
|
|
||||||
malloc_cprintf(write_cb, cbopaque, "\n");
|
|
||||||
}
|
|
||||||
if (general) {
|
if (general) {
|
||||||
stats_general_print(write_cb, cbopaque, json, config_stats);
|
stats_general_print(&emitter, config_stats);
|
||||||
}
|
}
|
||||||
if (config_stats) {
|
if (config_stats) {
|
||||||
stats_print_helper(write_cb, cbopaque, json, merged, destroyed,
|
stats_print_helper(write_cb, cbopaque, json, merged, destroyed,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user