Fallback to unbuffered printing if OOM
This commit is contained in:
parent
cd6e908241
commit
f81341a48b
@ -23,7 +23,9 @@ buf_write_init(buf_write_arg_t *arg, void (*write_cb)(void *, const char *),
|
||||
void *cbopaque, char *buf, size_t buf_len) {
|
||||
arg->write_cb = write_cb;
|
||||
arg->cbopaque = cbopaque;
|
||||
assert(buf != NULL);
|
||||
arg->buf = buf;
|
||||
assert(buf_len >= 2);
|
||||
arg->buf_size = buf_len - 1; /* Accommodating '\0' at the end. */
|
||||
arg->buf_end = 0;
|
||||
}
|
||||
|
@ -3716,6 +3716,9 @@ je_malloc_stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
||||
char *buf = (char *)iallocztm(tsdn, STATS_PRINT_BUFSIZE,
|
||||
sz_size2index(STATS_PRINT_BUFSIZE), false, NULL, true,
|
||||
arena_get(TSDN_NULL, 0, true), true);
|
||||
if (buf == NULL) {
|
||||
stats_print(write_cb, cbopaque, opts);
|
||||
} else {
|
||||
buf_write_arg_t buf_arg;
|
||||
buf_write_init(&buf_arg, write_cb, cbopaque, buf,
|
||||
STATS_PRINT_BUFSIZE);
|
||||
@ -3723,6 +3726,7 @@ je_malloc_stats_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
||||
buf_write_flush(&buf_arg);
|
||||
idalloctm(tsdn, buf, NULL, NULL, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
check_entry_exit_locking(tsdn);
|
||||
LOG("core.malloc_stats_print.exit", "");
|
||||
|
@ -633,12 +633,15 @@ prof_log_stop(tsdn_t *tsdn) {
|
||||
sz_size2index(PROF_LOG_STOP_BUFSIZE), false, NULL, true,
|
||||
arena_get(TSDN_NULL, 0, true), true);
|
||||
buf_write_arg_t buf_arg;
|
||||
if (buf == NULL) {
|
||||
emitter_init(&emitter, emitter_output_json_compact,
|
||||
prof_emitter_write_cb, &arg);
|
||||
} else {
|
||||
buf_write_init(&buf_arg, prof_emitter_write_cb, &arg, buf,
|
||||
PROF_LOG_STOP_BUFSIZE);
|
||||
|
||||
/* Emit to json. */
|
||||
emitter_init(&emitter, emitter_output_json_compact, buf_write_cb,
|
||||
&buf_arg);
|
||||
emitter_init(&emitter, emitter_output_json_compact,
|
||||
buf_write_cb, &buf_arg);
|
||||
}
|
||||
|
||||
emitter_begin(&emitter);
|
||||
prof_log_emit_metadata(&emitter);
|
||||
@ -647,8 +650,10 @@ prof_log_stop(tsdn_t *tsdn) {
|
||||
prof_log_emit_allocs(tsd, &emitter);
|
||||
emitter_end(&emitter);
|
||||
|
||||
if (buf != NULL) {
|
||||
buf_write_flush(&buf_arg);
|
||||
idalloctm(tsdn, buf, NULL, NULL, true, true);
|
||||
}
|
||||
|
||||
/* Reset global state. */
|
||||
if (log_tables_initialized) {
|
||||
|
@ -465,12 +465,17 @@ prof_recent_alloc_dump(tsd_t *tsd, void (*write_cb)(void *, const char *),
|
||||
char *buf = (char *)iallocztm(tsd_tsdn(tsd), PROF_RECENT_PRINT_BUFSIZE,
|
||||
sz_size2index(PROF_RECENT_PRINT_BUFSIZE), false, NULL, true,
|
||||
arena_get(tsd_tsdn(tsd), 0, false), true);
|
||||
emitter_t emitter;
|
||||
buf_write_arg_t buf_arg;
|
||||
if (buf == NULL) {
|
||||
emitter_init(&emitter, emitter_output_json_compact, write_cb,
|
||||
cbopaque);
|
||||
} else {
|
||||
buf_write_init(&buf_arg, write_cb, cbopaque, buf,
|
||||
PROF_RECENT_PRINT_BUFSIZE);
|
||||
emitter_t emitter;
|
||||
emitter_init(&emitter, emitter_output_json_compact, buf_write_cb,
|
||||
&buf_arg);
|
||||
emitter_init(&emitter, emitter_output_json_compact,
|
||||
buf_write_cb, &buf_arg);
|
||||
}
|
||||
emitter_begin(&emitter);
|
||||
|
||||
malloc_mutex_lock(tsd_tsdn(tsd), &prof_recent_alloc_mtx);
|
||||
@ -530,9 +535,11 @@ prof_recent_alloc_dump(tsd_t *tsd, void (*write_cb)(void *, const char *),
|
||||
malloc_mutex_unlock(tsd_tsdn(tsd), &prof_recent_alloc_mtx);
|
||||
|
||||
emitter_end(&emitter);
|
||||
if (buf != NULL) {
|
||||
buf_write_flush(&buf_arg);
|
||||
idalloctm(tsd_tsdn(tsd), buf, NULL, NULL, true, true);
|
||||
}
|
||||
}
|
||||
#undef PROF_RECENT_PRINT_BUFSIZE
|
||||
|
||||
bool
|
||||
|
Loading…
Reference in New Issue
Block a user