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

Make compact json format as default

Browse Source 
Saves 20-50% of the output size.
This commit is contained in:
Yinan Zhang 2019-08-09 10:19:51 -07:00
parent a219cfcda3
commit eb70fef8ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/prof_log.c
View File

@ -635,8 +635,8 @@ prof_log_stop(tsdn_t *tsdn) {
prof_log_stop_buf, PROF_LOG_STOP_BUFSIZE - 1, 0}; prof_log_stop_buf, PROF_LOG_STOP_BUFSIZE - 1, 0};
/* Emit to json. */ /* Emit to json. */
emitter_init(&emitter, emitter_output_json, buffered_write_cb, emitter_init(&emitter, emitter_output_json_compact,
&prof_log_stop_buf_arg); buffered_write_cb, &prof_log_stop_buf_arg);
emitter_begin(&emitter); emitter_begin(&emitter);
prof_log_emit_metadata(&emitter); prof_log_emit_metadata(&emitter);

8
src/stats.c
View File

@ -1181,7 +1181,7 @@ stats_general_print(emitter_t *emitter) {
* We do enough mallctls in a loop that we actually want to omit them * We do enough mallctls in a loop that we actually want to omit them
* (not just omit the printing). * (not just omit the printing).
*/ */
if (emitter->output == emitter_output_json) { if (emitter_outputs_json(emitter)) {
emitter_json_array_kv_begin(emitter, "bin"); emitter_json_array_kv_begin(emitter, "bin");
for (unsigned i = 0; i < nbins; i++) { for (unsigned i = 0; i < nbins; i++) {
emitter_json_object_begin(emitter); emitter_json_object_begin(emitter);
@ -1212,7 +1212,7 @@ stats_general_print(emitter_t *emitter) {
emitter_kv(emitter, "nlextents", "Number of large size classes", emitter_kv(emitter, "nlextents", "Number of large size classes",
emitter_type_unsigned, &nlextents); emitter_type_unsigned, &nlextents);
if (emitter->output == emitter_output_json) { if (emitter_outputs_json(emitter)) {
emitter_json_array_kv_begin(emitter, "lextent"); emitter_json_array_kv_begin(emitter, "lextent");
for (unsigned i = 0; i < nlextents; i++) { for (unsigned i = 0; i < nlextents; i++) {
emitter_json_object_begin(emitter); emitter_json_object_begin(emitter);
@ -1437,8 +1437,8 @@ stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
emitter_t emitter; emitter_t emitter;
emitter_init(&emitter, emitter_init(&emitter,
json ? emitter_output_json : emitter_output_table, write_cb, json ? emitter_output_json_compact : emitter_output_table,
cbopaque); write_cb, cbopaque);
emitter_begin(&emitter); emitter_begin(&emitter);
emitter_table_printf(&emitter, "___ Begin jemalloc statistics ___\n"); emitter_table_printf(&emitter, "___ Begin jemalloc statistics ___\n");
emitter_json_object_kv_begin(&emitter, "jemalloc"); emitter_json_object_kv_begin(&emitter, "jemalloc");