From 32f1e04359206dd5adc141c16e5bb8b00a61eb6d Mon Sep 17 00:00:00 2001 From: jb Date: Wed, 17 Jun 1998 22:29:12 +0000 Subject: Don't allow a SIGCHLD to wake up a thread if the process has the default signal handler installed for SIGCHLD. The ACE MT_SOCK_Test was hanging as the result of being interrupted when it didn't expect to be. --- lib/libpthread/thread/thr_sig.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/libpthread/thread/thr_sig.c') diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c index cb323e7..316b78e 100644 --- a/lib/libpthread/thread/thr_sig.c +++ b/lib/libpthread/thread/thr_sig.c @@ -292,14 +292,17 @@ _thread_signal(pthread_t pthread, int sig) case PS_SLEEP_WAIT: case PS_SIGWAIT: case PS_SELECT_WAIT: - /* Flag the operation as interrupted: */ - pthread->interrupted = 1; + if (sig != SIGCHLD || + _thread_sigact[sig - 1].sa_handler != SIG_DFL) { + /* Flag the operation as interrupted: */ + pthread->interrupted = 1; - /* Change the state of the thread to run: */ - PTHREAD_NEW_STATE(pthread,PS_RUNNING); + /* Change the state of the thread to run: */ + PTHREAD_NEW_STATE(pthread,PS_RUNNING); - /* Return the signal number: */ - pthread->signo = sig; + /* Return the signal number: */ + pthread->signo = sig; + } break; } } -- cgit v1.1