Fix a prof_tctx_t/prof_tdata_t cleanup race.
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.
diff --git a/src/prof.c b/src/prof.c
index 3e2e427..4016327 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -128,8 +128,8 @@
JEMALLOC_INLINE_C int
prof_tctx_comp(const prof_tctx_t *a, const prof_tctx_t *b)
{
- uint64_t a_uid = a->tdata->thr_uid;
- uint64_t b_uid = b->tdata->thr_uid;
+ uint64_t a_uid = a->thr_uid;
+ uint64_t b_uid = b->thr_uid;
return ((a_uid > b_uid) - (a_uid < b_uid));
}
@@ -755,6 +755,7 @@
return (NULL);
}
ret.p->tdata = tdata;
+ ret.p->thr_uid = tdata->thr_uid;
memset(&ret.p->cnts, 0, sizeof(prof_cnt_t));
ret.p->gctx = gctx;
ret.p->prepared = true;
@@ -1051,9 +1052,8 @@
if (prof_dump_printf(propagate_err,
" t%"PRIu64": %"PRIu64": %"PRIu64" [%"PRIu64": %"PRIu64"]\n",
- tctx->tdata->thr_uid, tctx->dump_cnts.curobjs,
- tctx->dump_cnts.curbytes, tctx->dump_cnts.accumobjs,
- tctx->dump_cnts.accumbytes))
+ tctx->thr_uid, tctx->dump_cnts.curobjs, tctx->dump_cnts.curbytes,
+ tctx->dump_cnts.accumobjs, tctx->dump_cnts.accumbytes))
return (tctx);
return (NULL);
}