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

Fix a prof_tctx_t/prof_tdata_t cleanup race.

Browse Source 
Fix a prof_tctx_t/prof_tdata_t cleanup race by storing a copy of thr_uid
in prof_tctx_t, so that the associated tdata need not be present during
tctx teardown.
This commit is contained in:
Jason Evans 2014-10-12 13:03:20 -07:00
parent 381c23dd9d
commit 44c97b712e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/jemalloc/internal/prof.h
View File

@ -89,6 +89,12 @@ struct prof_tctx_s {
/* Thread data for thread that performed the allocation. */ /* Thread data for thread that performed the allocation. */
prof_tdata_t *tdata; prof_tdata_t *tdata;
/*
* Copy of tdata->thr_uid, necessary because tdata may be defunct during
* teardown.
*/
uint64_t thr_uid;
/* Profiling counters, protected by tdata->lock. */ /* Profiling counters, protected by tdata->lock. */
prof_cnt_t cnts; prof_cnt_t cnts;

10
src/prof.c
View File

@ -128,8 +128,8 @@ static char *prof_thread_name_alloc(tsd_t *tsd, const char *thread_name);
JEMALLOC_INLINE_C int JEMALLOC_INLINE_C int
prof_tctx_comp(const prof_tctx_t *a, const prof_tctx_t *b) prof_tctx_comp(const prof_tctx_t *a, const prof_tctx_t *b)
{ {
uint64_t a_uid = a->tdata->thr_uid; uint64_t a_uid = a->thr_uid;
uint64_t b_uid = b->tdata->thr_uid; uint64_t b_uid = b->thr_uid;
return ((a_uid > b_uid) - (a_uid < b_uid)); return ((a_uid > b_uid) - (a_uid < b_uid));
} }
@ -755,6 +755,7 @@ prof_lookup(tsd_t *tsd, prof_bt_t *bt)
return (NULL); return (NULL);
} }
ret.p->tdata = tdata; ret.p->tdata = tdata;
ret.p->thr_uid = tdata->thr_uid;
memset(&ret.p->cnts, 0, sizeof(prof_cnt_t)); memset(&ret.p->cnts, 0, sizeof(prof_cnt_t));
ret.p->gctx = gctx; ret.p->gctx = gctx;
ret.p->prepared = true; ret.p->prepared = true;
@ -1051,9 +1052,8 @@ prof_tctx_dump_iter(prof_tctx_tree_t *tctxs, prof_tctx_t *tctx, void *arg)
if (prof_dump_printf(propagate_err, if (prof_dump_printf(propagate_err,
" t%"PRIu64": %"PRIu64": %"PRIu64" [%"PRIu64": %"PRIu64"]\n", " t%"PRIu64": %"PRIu64": %"PRIu64" [%"PRIu64": %"PRIu64"]\n",
tctx->tdata->thr_uid, tctx->dump_cnts.curobjs, tctx->thr_uid, tctx->dump_cnts.curobjs, tctx->dump_cnts.curbytes,
tctx->dump_cnts.curbytes, tctx->dump_cnts.accumobjs, tctx->dump_cnts.accumobjs, tctx->dump_cnts.accumbytes))
tctx->dump_cnts.accumbytes))
return (tctx); return (tctx);
return (NULL); return (NULL);
} }