libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* exceptions.cc (sigreturn): Call any pending signals prior to resetting the 

signal mask so that stacked signals behave correctly.
(sigdelayed): Avoid a race where a signal could end up calling an incorrect
signal handler if two signals come in close together.
This commit is contained in:
Christopher Faylor 2001-01-27 02:23:46 +00:00
parent 7646d1a111
commit 206a8d884b
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jan 26 21:20:28 2001 Christopher Faylor <cgf@cygnus.com>
* exceptions.cc (sigreturn): Call any pending signals prior to
resetting the signal mask so that stacked signals behave correctly.
(sigdelayed): Avoid a race where a signal could end up calling an
incorrect signal handler if two signals come in close together.
Tue Jan 23 21:56:00 2001 Corinna Vinschen <corinna@vinschen.de> Tue Jan 23 21:56:00 2001 Corinna Vinschen <corinna@vinschen.de>
* mmap.cc (fhandler_disk_file::mmap): Call CreateFileMapping with * mmap.cc (fhandler_disk_file::mmap): Call CreateFileMapping with

29
winsup/cygwin/exceptions.cc
View File

@ -653,7 +653,6 @@ interrupt_setup (int sig, void *handler, DWORD retaddr, DWORD *retaddr_on_stack,
{ {
sigsave.retaddr = retaddr; sigsave.retaddr = retaddr;
sigsave.retaddr_on_stack = retaddr_on_stack; sigsave.retaddr_on_stack = retaddr_on_stack;
sigsave.oldmask = myself->getsigmask (); // Remember for restoration
/* FIXME: Not multi-thread aware */ /* FIXME: Not multi-thread aware */
sigsave.newmask = myself->getsigmask () | siga.sa_mask | SIGTOMASK (sig); sigsave.newmask = myself->getsigmask () | siga.sa_mask | SIGTOMASK (sig);
sigsave.sa_flags = siga.sa_flags; sigsave.sa_flags = siga.sa_flags;
@ -738,9 +737,9 @@ set_sig_errno (int e)
// sigproc_printf ("errno %d", e); // sigproc_printf ("errno %d", e);
} }
static int call_handler (int, void *, struct sigaction&) __attribute__((regparm(3))); static int setup_handler (int, void *, struct sigaction&) __attribute__((regparm(3)));
static int static int
call_handler (int sig, void *handler, struct sigaction& siga) setup_handler (int sig, void *handler, struct sigaction& siga)
{ {
CONTEXT cx; CONTEXT cx;
bool interrupted = 0; bool interrupted = 0;
@ -860,7 +859,7 @@ set_pending:
#endif /* i386 */ #endif /* i386 */
#ifndef HAVE_CALL_HANDLER #ifndef HAVE_CALL_HANDLER
#error "Need to supply machine dependent call_handler" #error "Need to supply machine dependent setup_handler"
#endif #endif
/* Keyboard interrupt handler. */ /* Keyboard interrupt handler. */
@ -1000,7 +999,7 @@ stop:
dosig: dosig:
/* Dispatch to the appropriate function. */ /* Dispatch to the appropriate function. */
sigproc_printf ("signal %d, about to call %p", sig, handler); sigproc_printf ("signal %d, about to call %p", sig, handler);
rc = call_handler (sig, handler, thissig); rc = setup_handler (sig, handler, thissig);
done: done:
sigproc_printf ("returning %d", rc); sigproc_printf ("returning %d", rc);
@ -1123,13 +1122,23 @@ _sigreturn:
addl $4,%%esp # Remove argument addl $4,%%esp # Remove argument
movl %%esp,%%ebp movl %%esp,%%ebp
addl $36,%%ebp addl $36,%%ebp
call _set_process_mask@4
cmpl $0,%4 # Did a signal come in?
jz 1f # No, if zero
call _call_signal_handler@0 # yes handle the signal
# FIXME: There is a race here. The signal handler could set up
# the sigsave structure between _call_signal_handler and the
# end of _set_process_mask. This would make cygwin detect an
# incorrect signal mask.
1: call _set_process_mask@4
popl %%eax # saved errno popl %%eax # saved errno
testl %%eax,%%eax # Is it < 0 testl %%eax,%%eax # Is it < 0
jl 1f # yup. ignore it jl 2f # yup. ignore it
movl %1,%%ebx movl %1,%%ebx
movl %%eax,(%%ebx) movl %%eax,(%%ebx)
1: popl %%eax 2: popl %%eax
popl %%ebx popl %%ebx
popl %%ecx popl %%ecx
popl %%edx popl %%edx
@ -1158,11 +1167,13 @@ _sigdelayed0:
pushl $_sigreturn pushl $_sigreturn
call _reset_signal_arrived@0 call _reset_signal_arrived@0
pushl %5
movl $0,%0 movl $0,%0
pushl %8 pushl %8
call _set_process_mask@4 call _set_process_mask@4
jmp *%5 popl %%eax
jmp *%%eax
__no_sig_end: __no_sig_end:
" : "=m" (sigsave.sig) : "m" (&_impure_ptr->_errno), " : "=m" (sigsave.sig) : "m" (&_impure_ptr->_errno),