diff options
author | deischen <deischen@FreeBSD.org> | 2001-03-09 16:05:43 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2001-03-09 16:05:43 +0000 |
commit | 0d4935c84eec044964c24cc0478433100df12b01 (patch) | |
tree | 4bcc2184b484391217d905554ffd45618deb90f0 /lib/libc_r | |
parent | 8080165a1bb8ca2b459cb6a055d5b06ac00fa6f5 (diff) | |
download | FreeBSD-src-0d4935c84eec044964c24cc0478433100df12b01.zip FreeBSD-src-0d4935c84eec044964c24cc0478433100df12b01.tar.gz |
Correct a race condition where it was possible for a signaled
thread to become stranded and not placed in the run queue.
MFC Candidate
Reported by: tegge
Diffstat (limited to 'lib/libc_r')
-rw-r--r-- | lib/libc_r/uthread/uthread_sig.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c index a005adf..71a88ef 100644 --- a/lib/libc_r/uthread/uthread_sig.c +++ b/lib/libc_r/uthread/uthread_sig.c @@ -569,9 +569,9 @@ thread_sig_handle_special(int sig) static void thread_sig_add(pthread_t pthread, int sig, int has_args) { - struct pthread *curthread = _get_curthread(); int restart; int suppress_handler = 0; + int thread_is_active = 0; restart = _thread_sigact[sig - 1].sa_flags & SA_RESTART; @@ -604,6 +604,12 @@ thread_sig_add(pthread_t pthread, int sig, int has_args) */ if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0) PTHREAD_PRIOQ_REMOVE(pthread); + else + /* + * This thread is running; avoid placing it in + * the run queue: + */ + thread_is_active = 1; break; case PS_SUSPENDED: @@ -753,7 +759,7 @@ thread_sig_add(pthread_t pthread, int sig, int has_args) * the thread in the run queue. */ pthread->active_priority |= PTHREAD_SIGNAL_PRIORITY; - if (pthread != curthread) + if (thread_is_active == 0) PTHREAD_PRIOQ_INSERT_TAIL(pthread); } } |