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

Fix the prof thread_name reference in prof_recent dump.

Browse Source 
As pointed out in #2434, the thread_name in prof_tdata_t was changed in #2407.
This also requires an update for the prof_recent dump, specifically the emitter
expects a "char **" which is fixed in this commit.
This commit is contained in:
Qi Wang 2023-05-10 13:20:40 -07:00 committed by Qi Wang
parent 6ea8a7e928
commit 94ace05832
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/prof_recent.c
View File

@ -496,8 +496,9 @@ prof_recent_alloc_dump_node(emitter_t *emitter, prof_recent_t *node) {
prof_tdata_t *alloc_tdata = node->alloc_tctx->tdata; prof_tdata_t *alloc_tdata = node->alloc_tctx->tdata;
assert(alloc_tdata != NULL); assert(alloc_tdata != NULL);
if (!prof_thread_name_empty(alloc_tdata)) { if (!prof_thread_name_empty(alloc_tdata)) {
const char *thread_name = alloc_tdata->thread_name;
emitter_json_kv(emitter, "alloc_thread_name", emitter_json_kv(emitter, "alloc_thread_name",
emitter_type_string, &alloc_tdata->thread_name); emitter_type_string, &thread_name);
} }
uint64_t alloc_time_ns = nstime_ns(&node->alloc_time); uint64_t alloc_time_ns = nstime_ns(&node->alloc_time);
emitter_json_kv(emitter, "alloc_time", emitter_type_uint64, emitter_json_kv(emitter, "alloc_time", emitter_type_uint64,
@ -512,8 +513,9 @@ prof_recent_alloc_dump_node(emitter_t *emitter, prof_recent_t *node) {
prof_tdata_t *dalloc_tdata = node->dalloc_tctx->tdata; prof_tdata_t *dalloc_tdata = node->dalloc_tctx->tdata;
assert(dalloc_tdata != NULL); assert(dalloc_tdata != NULL);
if (!prof_thread_name_empty(dalloc_tdata)) { if (!prof_thread_name_empty(dalloc_tdata)) {
const char *thread_name = dalloc_tdata->thread_name;
emitter_json_kv(emitter, "dalloc_thread_name", emitter_json_kv(emitter, "dalloc_thread_name",
emitter_type_string, &dalloc_tdata->thread_name); emitter_type_string, &thread_name);
} }
assert(!nstime_equals_zero(&node->dalloc_time)); assert(!nstime_equals_zero(&node->dalloc_time));
uint64_t dalloc_time_ns = nstime_ns(&node->dalloc_time); uint64_t dalloc_time_ns = nstime_ns(&node->dalloc_time);