OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

tsan: fix handling of signals 

(do not execute synchronous signals in recursive interceptors)

llvm-svn: 168421
This commit is contained in:
Dmitry Vyukov 2012-11-21 11:12:33 +00:00
parent 3233391b50
commit 9ca2afd3a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
View File

@ -1228,8 +1228,10 @@ static void ALWAYS_INLINE rtl_generic_sighandler(bool sigact, int sig,
sig == SIGABRT || sig == SIGFPE || sig == SIGPIPE || sig == SIGABRT || sig == SIGFPE || sig == SIGPIPE ||
// If we are sending signal to ourselves, we must process it now. // If we are sending signal to ourselves, we must process it now.
(sctx && sig == sctx->int_signal_send) || (sctx && sig == sctx->int_signal_send) ||
// If we are in blocking function, we can safely process it now. // If we are in blocking function, we can safely process it now
(sctx && sctx->in_blocking_func)) { // (but check if we are in a recursive interceptor,
// i.e. pthread_join()->munmap()).
(sctx && sctx->in_blocking_func && thr->in_rtl == 1)) {
CHECK(thr->in_rtl == 0 || thr->in_rtl == 1); CHECK(thr->in_rtl == 0 || thr->in_rtl == 1);
int in_rtl = thr->in_rtl; int in_rtl = thr->in_rtl;
thr->in_rtl = 0; thr->in_rtl = 0;