maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

tsan: fix race during pthread_join/detach 

llvm-svn: 157584
This commit is contained in:
Dmitry Vyukov 2012-05-28 17:32:50 +00:00
parent 6770dea704
commit 880bb6697f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
View File

@ -226,15 +226,20 @@ void ThreadFinish(ThreadState *thr) {
int ThreadTid(ThreadState *thr, uptr pc, uptr uid) {
CHECK_GT(thr->in_rtl, 0);
DPrintf("#%d: ThreadTid uid=%lu\n", thr->tid, uid);
Lock l(&CTX()->thread_mtx);
Context *ctx = CTX();
Lock l(&ctx->thread_mtx);
int res = -1;
for (unsigned tid = 0; tid < kMaxTid; tid++) {
if (CTX()->threads[tid] != 0
&& CTX()->threads[tid]->user_id == uid
&& CTX()->threads[tid]->status != ThreadStatusInvalid)
return tid;
ThreadContext *tctx = ctx->threads[tid];
if (tctx != 0 && tctx->user_id == uid
&& tctx->status != ThreadStatusInvalid) {
tctx->user_id = 0;
res = tid;
break;
}
}
return -1;
DPrintf("#%d: ThreadTid uid=%lu tid=%d\n", thr->tid, uid, res);
return res;
}
void ThreadJoin(ThreadState *thr, uptr pc, int tid) {