This is an archive of the discontinued LLVM Phabricator instance.

[tsan] Fix finalization of detached threads on OS X
ClosedPublic

Authored by kubamracek on Nov 13 2015, 2:36 AM.

Reviewers

Commits

Summary

Currently, we crash on finalization of detached threads, because we'll try to clear the ThreadState twice.

kubamracek retitled this revision from to [tsan] Fix finalization of detached threads on OS X.

kubamracek updated this object.

dvyukov edited edge metadata.

This revision is now accepted and ready to land.Nov 13 2015, 9:31 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

trunk/

lib/

tsan/

rtl/

2 lines

Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Lines	if (thread == pthread_self()) {
ThreadState *parent_thread_state = nullptr; // No parent.		ThreadState *parent_thread_state = nullptr; // No parent.
int tid = ThreadCreate(parent_thread_state, 0, (uptr)thread, true);		int tid = ThreadCreate(parent_thread_state, 0, (uptr)thread, true);
CHECK_NE(tid, 0);		CHECK_NE(tid, 0);
ThreadState *thr = cur_thread();		ThreadState *thr = cur_thread();
ThreadStart(thr, tid, GetTid());		ThreadStart(thr, tid, GetTid());
}		}
} else if (event == PTHREAD_INTROSPECTION_THREAD_DESTROY) {		} else if (event == PTHREAD_INTROSPECTION_THREAD_DESTROY) {
ThreadState *thr = cur_thread();		ThreadState *thr = cur_thread();
if (thr->tctx->parent_tid == kInvalidTid) {		if (thr->tctx && thr->tctx->parent_tid == kInvalidTid) {
DestroyThreadState();		DestroyThreadState();
}		}
}		}

if (prev_pthread_introspection_hook != nullptr)		if (prev_pthread_introspection_hook != nullptr)
prev_pthread_introspection_hook(event, thread, addr, size);		prev_pthread_introspection_hook(event, thread, addr, size);
}		}
#endif		#endif
Show All 37 Lines