diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-03-19 22:48:26 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-03-19 22:48:26 +0000 |
| commit | b8c8fa178681ad7596e5d4217735e7ec948dc7a7 (patch) | |
| tree | 3e0dbe9d695d7b5b5ab5df1823b107d72f26b9a7 | |
| parent | 78ace8a7e5103099f20423acbc6d03c1b5d53fdd (diff) | |
| download | newlib-b8c8fa178681ad7596e5d4217735e7ec948dc7a7.zip newlib-b8c8fa178681ad7596e5d4217735e7ec948dc7a7.tar.gz newlib-b8c8fa178681ad7596e5d4217735e7ec948dc7a7.tar.bz2 | |
* exceptions.cc (interruptible): Update debugging output.
(setup_handler): Ensure that wait_sig loop wakes up when we punt on sending a
signal.
* poll.cc (poll): Add signal guard here.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 8 | ||||
| -rw-r--r-- | winsup/cygwin/poll.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/thread.h | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3270764..5ba445c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 19 17:43:29 2001 Christopher Faylor <cgf@cygnus.com> + + * exceptions.cc (interruptible): Update debugging output. + (setup_handler): Ensure that wait_sig loop wakes up when we punt on + sending a signal. + * poll.cc (poll): Add signal guard here. + 2001-03-19 Egor Duda <deo@logos-m.ru> * tty.h (tty::create_inuse): Add new parameter to allow non- diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index c0d88a8..0c138ef 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -640,10 +640,8 @@ interruptible (DWORD pc, int testvalid = 0) else res = !strncasematch (windows_system_directory, checkdir, windows_system_directory_length); - minimal_printf ("h %p", h); # undef h - - minimal_printf ("interruptible %d", res); + sigproc_printf ("h %p, interruptible %d", res); return res; } @@ -856,11 +854,13 @@ setup_handler (int sig, void *handler, struct sigaction& siga) break; } -set_pending: + set_pending: if (!interrupted) { pending_signals = 1; /* FIXME: Probably need to be more tricky here */ sig_set_pending (sig); + sig_dispatch_pending (1); + Sleep (0); /* Hopefully, other process will be waking up soon. */ sigproc_printf ("couldn't send signal %d", sig); } else diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc index d55b2af..f3c9ef6 100644 --- a/winsup/cygwin/poll.cc +++ b/winsup/cygwin/poll.cc @@ -15,6 +15,7 @@ #include "fhandler.h" #include "dtable.h" #include "cygerrno.h" +#include "sigproc.h" extern "C" int @@ -23,6 +24,7 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout) int max_fd = 0; fd_set *open_fds, *read_fds, *write_fds, *except_fds; struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 }; + sigframe thisframe (mainthread); for (unsigned int i = 0; i < nfds; ++i) if (fds[i].fd > max_fd) diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h index d7a2985..18cb3c3 100644 --- a/winsup/cygwin/thread.h +++ b/winsup/cygwin/thread.h @@ -238,7 +238,7 @@ public: SemaphoreItem *GetSemaphore (sem_t * t); // Condition functions - CondItem *CreateCond (pthread_cond_t *, const pthread_condattr_t *); + CondItem *CreateCond (pthread_cond_t *, const pthread_condattr_t *); CondItem *GetCond (pthread_cond_t *); private: |