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

Buffer prof_log_stop

Browse Source 
Make use of the new buffered writer for the output of `prof_log_stop`.
This commit is contained in:
Yinan Zhang 2019-08-07 14:34:34 -07:00
parent 5934846612
commit ad3f7dbfa0
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/prof_log.c
View File

@ -160,6 +160,7 @@ prof_log_bt_index(tsd_t *tsd, prof_bt_t *bt) {
return node->index; return node->index;
} }
} }
static size_t static size_t
prof_log_thr_index(tsd_t *tsd, uint64_t thr_uid, const char *name) { prof_log_thr_index(tsd_t *tsd, uint64_t thr_uid, const char *name) {
assert(prof_logging_state == prof_logging_state_started); assert(prof_logging_state == prof_logging_state_started);
@ -576,7 +577,7 @@ prof_log_emit_metadata(emitter_t *emitter) {
emitter_json_object_end(emitter); emitter_json_object_end(emitter);
} }
#define PROF_LOG_STOP_BUFSIZE PROF_DUMP_BUFSIZE
bool bool
prof_log_stop(tsdn_t *tsdn) { prof_log_stop(tsdn_t *tsdn) {
if (!opt_prof || !prof_booted) { if (!opt_prof || !prof_booted) {
@ -624,11 +625,18 @@ prof_log_stop(tsdn_t *tsdn) {
return true; return true;
} }
/* Emit to json. */
struct prof_emitter_cb_arg_s arg; struct prof_emitter_cb_arg_s arg;
arg.fd = fd; arg.fd = fd;
emitter_init(&emitter, emitter_output_json, &prof_emitter_write_cb,
(void *)(&arg)); char *prof_log_stop_buf = (char *)iallocztm(tsdn,
PROF_LOG_STOP_BUFSIZE, sz_size2index(PROF_LOG_STOP_BUFSIZE),
false, NULL, true, arena_get(TSDN_NULL, 0, true), true);
buf_writer_arg_t prof_log_stop_buf_arg = {prof_emitter_write_cb, &arg,
prof_log_stop_buf, PROF_LOG_STOP_BUFSIZE - 1, 0};
/* Emit to json. */
emitter_init(&emitter, emitter_output_json, buffered_write_cb,
&prof_log_stop_buf_arg);
emitter_begin(&emitter); emitter_begin(&emitter);
prof_log_emit_metadata(&emitter); prof_log_emit_metadata(&emitter);
@ -637,6 +645,9 @@ prof_log_stop(tsdn_t *tsdn) {
prof_log_emit_allocs(tsd, &emitter); prof_log_emit_allocs(tsd, &emitter);
emitter_end(&emitter); emitter_end(&emitter);
buf_writer_flush(&prof_log_stop_buf_arg);
idalloctm(tsdn, prof_log_stop_buf, NULL, NULL, true, true);
/* Reset global state. */ /* Reset global state. */
if (log_tables_initialized) { if (log_tables_initialized) {
ckh_delete(tsd, &log_bt_node_set); ckh_delete(tsd, &log_bt_node_set);
@ -661,8 +672,9 @@ prof_log_stop(tsdn_t *tsdn) {
return false; return false;
} }
#endif #endif
return close(fd); return close(fd) || arg.ret == -1;
} }
#undef PROF_LOG_STOP_BUFSIZE
bool prof_log_init(tsd_t *tsd) { bool prof_log_init(tsd_t *tsd) {
if (opt_prof_log) { if (opt_prof_log) {

2
test/unit/prof_log.c
View File

@ -61,7 +61,7 @@ static void *f_thread(void *unused) {
int i; int i;
for (i = 0; i < N_PARAM; i++) { for (i = 0; i < N_PARAM; i++) {
void *p = malloc(100); void *p = malloc(100);
memset(p, 100, sizeof(char)); memset(p, 100, 1);
free(p); free(p);
} }