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

Fix a heap profiling regression.

Browse Source 
Fix prof_tctx_comp() to incorporate tctx state into the comparison.
During a dump it is possible for both a purgatory tctx and an otherwise
equivalent nominal tctx to reside in the tree at the same time.

This regression was introduced by
602c8e0971 (Implement per thread heap
profiling.).
This commit is contained in:
Jason Evans 2015-03-12 16:25:18 -07:00
parent fbd8d773ad
commit d69964bd2d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/prof.c
View File

@ -137,8 +137,13 @@ prof_tctx_comp(const prof_tctx_t *a, const prof_tctx_t *b)
{ {
uint64_t a_uid = a->thr_uid; uint64_t a_uid = a->thr_uid;
uint64_t b_uid = b->thr_uid; uint64_t b_uid = b->thr_uid;
int ret = (a_uid > b_uid) - (a_uid < b_uid);
return ((a_uid > b_uid) - (a_uid < b_uid)); if (ret == 0) {
prof_tctx_state_t a_state = a->state;
prof_tctx_state_t b_state = b->state;
ret = (a_state > b_state) - (a_state < b_state);
}
return (ret);
} }
rb_gen(static UNUSED, tctx_tree_, prof_tctx_tree_t, prof_tctx_t, rb_gen(static UNUSED, tctx_tree_, prof_tctx_tree_t, prof_tctx_t,