diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 24 | ||||
| -rw-r--r-- | linuxthreads/signals.c | 51 |
3 files changed, 75 insertions, 9 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 13c85c5..a678241 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +1999-09-18 Ulrich Drepper <drepper@cygnus.com> + + * pthread.c (pthread_handle_sigrestart_rt): New function. Use + this instead of pthread_handle_sigrestart if the signal is an RT + signal. + + * signals.c: Handle passing through of sighandler arguments also + for real-time signals. + 1999-09-03 Andreas Schwab <schwab@suse.de> * ptfork.c (__fork): Renamed from fork and use __libc_fork. Add diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 86f2446..2f10f06 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -21,6 +21,9 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#ifdef __i386__ +# include <ucontext.h> +#endif #include <sys/wait.h> #include <sys/resource.h> #include "pthread.h" @@ -161,6 +164,8 @@ static void pthread_handle_sigrestart(int sig); #else static void pthread_handle_sigcancel(int sig, struct sigcontext ctx); static void pthread_handle_sigrestart(int sig, struct sigcontext ctx); +static void pthread_handle_sigrestart_rt(int sig, struct siginfo *si, + struct ucontext *uc); #endif static void pthread_handle_sigdebug(int sig); @@ -318,7 +323,10 @@ static void pthread_initialize(void) #ifndef __i386__ sa.sa_handler = pthread_handle_sigrestart; #else - sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart; + if (__pthread_sig_restart >= SIGRTMIN) + sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart_rt; + else + sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart; #endif sigemptyset(&sa.sa_mask); sa.sa_flags = 0; @@ -568,6 +576,20 @@ static void pthread_handle_sigrestart(int sig, struct sigcontext ctx) siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1); } +#ifdef __i386__ +static void pthread_handle_sigrestart_rt(int sig, struct siginfo *si, + struct ucontext *uc) +{ + pthread_descr self; + asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS])); + self = thread_self(); + THREAD_SETMEM(self, p_signal, sig); + if (THREAD_GETMEM(self, p_signal_jmp) != NULL) + siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1); +} +#endif + + /* The handler for the CANCEL signal checks for cancellation (in asynchronous mode), for process-wide exit and exec requests. For the thread manager thread, redirect the signal to diff --git a/linuxthreads/signals.c b/linuxthreads/signals.c index 1293ce5..df375e8 100644 --- a/linuxthreads/signals.c +++ b/linuxthreads/signals.c @@ -19,6 +19,7 @@ #include "pthread.h" #include "internals.h" #include "spinlock.h" +#include <ucontext.h> #include <sigcontextinfo.h> int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask) @@ -69,7 +70,11 @@ int pthread_kill(pthread_t thread, int signo) /* User-provided signal handlers */ typedef void (*arch_sighandler_t) __PMT ((int, SIGCONTEXT)); -static arch_sighandler_t sighandler[NSIG]; +static union +{ + arch_sighandler_t old; + void (*rt) (int, struct siginfo *, struct ucontext *); +} sighandler[NSIG]; /* The wrapper around user-provided signal handlers */ static void pthread_sighandler(int signo, SIGCONTEXT ctx) @@ -88,7 +93,30 @@ static void pthread_sighandler(int signo, SIGCONTEXT ctx) in_sighandler = THREAD_GETMEM(self, p_in_sighandler); if (in_sighandler == NULL) THREAD_SETMEM(self, p_in_sighandler, CURRENT_STACK_FRAME); - sighandler[signo](signo, SIGCONTEXT_EXTRA_ARGS ctx); + sighandler[signo].old(signo, SIGCONTEXT_EXTRA_ARGS ctx); + if (in_sighandler == NULL) + THREAD_SETMEM(self, p_in_sighandler, NULL); +} + +/* The same, this time for real-time signals. */ +static void pthread_sighandler_rt(int signo, struct siginfo *si, + struct ucontext *uc) +{ + pthread_descr self = thread_self(); + char * in_sighandler; + /* If we're in a sigwait operation, just record the signal received + and return without calling the user's handler */ + if (THREAD_GETMEM(self, p_sigwaiting)) { + THREAD_SETMEM(self, p_sigwaiting, 0); + THREAD_SETMEM(self, p_signal, signo); + return; + } + /* Record that we're in a signal handler and call the user's + handler function */ + in_sighandler = THREAD_GETMEM(self, p_in_sighandler); + if (in_sighandler == NULL) + THREAD_SETMEM(self, p_in_sighandler, CURRENT_STACK_FRAME); + sighandler[signo].rt(signo, si, uc); if (in_sighandler == NULL) THREAD_SETMEM(self, p_in_sighandler, NULL); } @@ -110,7 +138,12 @@ int sigaction(int sig, const struct sigaction * act, newact = *act; if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL && sig > 0 && sig < NSIG) - newact.sa_handler = (__sighandler_t) pthread_sighandler; + { + if (sig >= SIGRTMIN) + newact.sa_handler = (__sighandler_t) pthread_sighandler_rt; + else + newact.sa_handler = (__sighandler_t) pthread_sighandler; + } newactp = &newact; } else @@ -120,9 +153,11 @@ int sigaction(int sig, const struct sigaction * act, if (sig > 0 && sig < NSIG) { if (oact != NULL) - oact->sa_handler = (__sighandler_t) sighandler[sig]; + oact->sa_handler = (__sighandler_t) sighandler[sig].old; if (act) - sighandler[sig] = (arch_sighandler_t) act->sa_handler; + /* For the assignment is does not matter whether it's a normal + or real-time signal. */ + sighandler[sig].old = (arch_sighandler_t) act->sa_handler; } return 0; } @@ -153,9 +188,9 @@ int sigwait(const sigset_t * set, int * sig) s != __pthread_sig_cancel && s != __pthread_sig_debug) { sigdelset(&mask, s); - if (sighandler[s] == NULL || - sighandler[s] == (arch_sighandler_t) SIG_DFL || - sighandler[s] == (arch_sighandler_t) SIG_IGN) { + if (sighandler[s].old == NULL || + sighandler[s].old == (arch_sighandler_t) SIG_DFL || + sighandler[s].old == (arch_sighandler_t) SIG_IGN) { sa.sa_handler = pthread_null_sighandler; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; |