diff options
author | jb <jb@FreeBSD.org> | 1998-06-10 22:25:18 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 1998-06-10 22:25:18 +0000 |
commit | 45e8efa5ea54d24c71d47a462ce63a3083abe08b (patch) | |
tree | 874c71f4e715a8af6640c878758b6cee96776312 /lib/libc_r | |
parent | cccdaf6051b023c2e52ce8373964045e54418380 (diff) | |
download | FreeBSD-src-45e8efa5ea54d24c71d47a462ce63a3083abe08b.zip FreeBSD-src-45e8efa5ea54d24c71d47a462ce63a3083abe08b.tar.gz |
Remove SA_RESTART from the signal dispatch in user-space since this
seems to be tripping up a lot of applications.
Diffstat (limited to 'lib/libc_r')
-rw-r--r-- | lib/libc_r/uthread/uthread_sig.c | 131 |
1 files changed, 39 insertions, 92 deletions
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c index 43ef9e6..1b1542e 100644 --- a/lib/libc_r/uthread/uthread_sig.c +++ b/lib/libc_r/uthread/uthread_sig.c @@ -242,99 +242,46 @@ _thread_signal(pthread_t pthread, int sig) */ sigaddset(&pthread->sigpend,sig); - /* Check if system calls are not restarted: */ - if ((_thread_sigact[sig - 1].sa_flags & SA_RESTART) != 0) { - /* - * System calls are flagged for restart. - * - * Process according to thread state: - */ - switch (pthread->state) { - /* - * States which do not change when a signal is trapped: - */ - case PS_COND_WAIT: - case PS_DEAD: - case PS_FDLR_WAIT: - case PS_FDLW_WAIT: - case PS_FILE_WAIT: - case PS_JOIN: - case PS_MUTEX_WAIT: - case PS_RUNNING: - case PS_STATE_MAX: - case PS_SIGTHREAD: - case PS_SUSPENDED: - /* Nothing to do here. */ - break; - - /* - * System calls that are restarted when interrupted by - * a signal: - */ - case PS_FDR_WAIT: - case PS_FDW_WAIT: - case PS_SELECT_WAIT: - break; - - /* - * States that are interrupted by the occurrence of a signal - * other than the scheduling alarm: - */ - case PS_SLEEP_WAIT: - case PS_SIGWAIT: - case PS_WAIT_WAIT: - /* Flag the operation as interrupted: */ - pthread->interrupted = 1; - - /* Change the state of the thread to run: */ - PTHREAD_NEW_STATE(pthread,PS_RUNNING); - - /* Return the signal number: */ - pthread->signo = sig; - break; - } - } else { - /* - * Process according to thread state: - */ - switch (pthread->state) { - /* - * States which do not change when a signal is trapped: - */ - case PS_COND_WAIT: - case PS_DEAD: - case PS_FDLR_WAIT: - case PS_FDLW_WAIT: - case PS_FILE_WAIT: - case PS_JOIN: - case PS_MUTEX_WAIT: - case PS_RUNNING: - case PS_STATE_MAX: - case PS_SIGTHREAD: - case PS_SUSPENDED: - /* Nothing to do here. */ - break; - - /* - * States that are interrupted by the occurrence of a signal - * other than the scheduling alarm: - */ - case PS_FDR_WAIT: - case PS_FDW_WAIT: - case PS_SLEEP_WAIT: - case PS_SIGWAIT: - case PS_WAIT_WAIT: - case PS_SELECT_WAIT: - /* Flag the operation as interrupted: */ - pthread->interrupted = 1; - - /* Change the state of the thread to run: */ - PTHREAD_NEW_STATE(pthread,PS_RUNNING); + /* + * Process according to thread state: + */ + switch (pthread->state) { + /* + * States which do not change when a signal is trapped: + */ + case PS_COND_WAIT: + case PS_DEAD: + case PS_FDLR_WAIT: + case PS_FDLW_WAIT: + case PS_FILE_WAIT: + case PS_JOIN: + case PS_MUTEX_WAIT: + case PS_RUNNING: + case PS_STATE_MAX: + case PS_SIGTHREAD: + case PS_SUSPENDED: + /* Nothing to do here. */ + break; - /* Return the signal number: */ - pthread->signo = sig; - break; - } + /* + * States that are interrupted by the occurrence of a signal + * other than the scheduling alarm: + */ + case PS_FDR_WAIT: + case PS_FDW_WAIT: + case PS_SLEEP_WAIT: + case PS_SIGWAIT: + case PS_WAIT_WAIT: + case PS_SELECT_WAIT: + /* Flag the operation as interrupted: */ + pthread->interrupted = 1; + + /* Change the state of the thread to run: */ + PTHREAD_NEW_STATE(pthread,PS_RUNNING); + + /* Return the signal number: */ + pthread->signo = sig; + break; } } |