diff options
Diffstat (limited to 'winsup/cygwin/sigproc.h')
| -rw-r--r-- | winsup/cygwin/sigproc.h | 115 |
1 files changed, 35 insertions, 80 deletions
diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h index 06ebd68d8..2900da4cc 100644 --- a/winsup/cygwin/sigproc.h +++ b/winsup/cygwin/sigproc.h @@ -11,7 +11,6 @@ details. */ #pragma once #include <signal.h> -#include "sync.h" #ifdef NSIG enum @@ -58,9 +57,13 @@ struct sigpacket int __stdcall process () __attribute__ ((regparm (1))); }; -void __stdcall sig_dispatch_pending (bool fast = false) - __attribute__ ((regparm (1))); -void set_signal_mask (sigset_t&, sigset_t) __attribute__ ((regparm (2))); +extern HANDLE signal_arrived; +extern HANDLE sigCONT; + +void __stdcall sig_dispatch_pending (bool fast = false); +#ifdef EXITCODE_SET +extern "C" void __stdcall set_signal_mask (sigset_t newmask, sigset_t&); +#endif int __stdcall handle_sigprocmask (int sig, const sigset_t *set, sigset_t *oldset, sigset_t& opmask) __attribute__ ((regparm (3))); @@ -76,12 +79,40 @@ void __stdcall proc_terminate (); void __stdcall sigproc_init (); #ifdef __INSIDE_CYGWIN__ void __stdcall sigproc_terminate (enum exit_states); + +static inline DWORD __attribute__ ((always_inline)) +cygwait (HANDLE h, DWORD howlong = INFINITE) +{ + HANDLE w4[3]; + DWORD n = 0; + DWORD wait_signal; + if ((w4[n] = h) != NULL) + wait_signal = WAIT_OBJECT_0 + ++n; + else + wait_signal = WAIT_OBJECT_0 + 15; /* Arbitrary. Don't call signal + handler if only waiting for signal */ + w4[n++] = signal_arrived; + if ((w4[n] = pthread::get_cancel_event ()) != NULL) + n++; + DWORD res; + while ((res = WaitForMultipleObjects (n, w4, FALSE, howlong)) == wait_signal + && (_my_tls.call_signal_handler () || &_my_tls != _main_tls)) + continue; + return res; +} + +static inline DWORD __attribute__ ((always_inline)) +cygwait (DWORD wait) +{ + return cygwait ((HANDLE) NULL, wait); +} #endif bool __stdcall pid_exists (pid_t) __attribute__ ((regparm(1))); int __stdcall sig_send (_pinfo *, siginfo_t&, class _cygtls *tls = NULL) __attribute__ ((regparm (3))); int __stdcall sig_send (_pinfo *, int) __attribute__ ((regparm (2))); void __stdcall signal_fixup_after_exec (); void __stdcall sigalloc (); +void __stdcall create_signal_arrived (); int kill_pgrp (pid_t, siginfo_t&); int killsys (pid_t, int); @@ -90,80 +121,4 @@ extern char myself_nowait_dummy[]; extern struct sigaction *global_sigs; -class lock_signals -{ - bool worked; -public: - lock_signals () - { - worked = sig_send (NULL, __SIGHOLD) == 0; - } - operator int () const - { - return worked; - } - void dont_bother () - { - worked = false; - } - ~lock_signals () - { - if (worked) - sig_send (NULL, __SIGNOHOLD); - } -}; - -class lock_pthread -{ - bool bother; -public: - lock_pthread (): bother (1) - { - pthread::atforkprepare (); - } - void dont_bother () - { - bother = false; - } - ~lock_pthread () - { - if (bother) - pthread::atforkparent (); - } -}; - -class hold_everything -{ - bool ischild; - /* Note the order of the locks below. It is important, - to avoid races, that the lock order be preserved. - - pthread is first because it serves as a master lock - against other forks being attempted while this one is active. - - signals is next to stop signal processing for the duration - of the fork. - - process is last. If it is put before signals, then a deadlock - could be introduced if the process attempts to exit due to a signal. */ - lock_pthread pthread; - lock_signals signals; - lock_process process; - -public: - hold_everything (bool x = false): ischild (x) {} - operator int () const {return signals;} - - ~hold_everything() - { - if (ischild) - { - pthread.dont_bother (); - process.dont_bother (); - signals.dont_bother (); - } - } - -}; - #define myself_nowait ((_pinfo *) myself_nowait_dummy) |