diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-06-18 00:50:24 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-06-18 00:50:24 +0400 |
| commit | 4ae63783821bd2114246166957d25b2acd26c875 (patch) | |
| tree | 0b7972e9330fa3a3f863621afd18643e485a151f /winsup/cygwin/wait.cc | |
| parent | d66ef282c2473d7df911e6d7d6ef1fc778777097 (diff) | |
Add '#include "cygwait.h"' throughout, where appropriate.
* DevNotes: Add entry cgf-000012.
* Makefile.in (DLL_OFILES): Add cygwait.o.
* sigproc.h: Remove cygwait definitions.
* cygwait.h: New file. Define/declare Cygwin waitfor functions.
* cygwait.cc: Ditto.
* exceptions.cc: Include cygwait.h.
(handle_sigsuspend): Accommodate change in cancelable_wait arguments.
(sigpacket::process): Display thread tls in debugging output.
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Use symbolic names
for signal and cancel return.
* fhandler_console.cc (fhandler_console::read): Ditto.
(fhandler_dev_dsp::Audio_out::waitforspace): Ditto.
fhandler_dev_dsp::Audio_in::waitfordata): Ditto.
* fhandler_fifo.cc (fhandler_fifo::wait): Ditto.
* fhandler_serial.cc (fhandler_serial::raw_read): Ditto.
* fhandler_tty.cc (fhandler_pty_slave::read): Ditto.
* select.cc (cygwin_select): Ditto.
* wait.cc (wait4): Ditto.
* thread.cc (cancelable_wait): Move definition to cygwait.h.
(pthread_cond::wait): Accommodate change in cancelable_wait arguments.
(pthread_mutex::lock): Ditto.
(pthread_spinlock::lock): Ditto.
(pthread::join): Ditto.
(pthread::thread_init_wrapper): Display tls in debugging output.
(semaphore::_timedwait): Ditto.
* thread.h (cw_sig_wait): Move to cygwait.h.
(cw_cancel_action): Delete.
(cancelable_wait): Move declaration to cygwait.h.
Diffstat (limited to 'winsup/cygwin/wait.cc')
| -rw-r--r-- | winsup/cygwin/wait.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc index 91a76239a..829c123bd 100644 --- a/winsup/cygwin/wait.cc +++ b/winsup/cygwin/wait.cc @@ -1,7 +1,7 @@ /* wait.cc: Posix wait routines. Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2009, 2011 Red Hat, Inc. + 2005, 2009, 2011, 2012 Red Hat, Inc. This file is part of Cygwin. @@ -14,6 +14,7 @@ details. */ #include "sigproc.h" #include "thread.h" #include "cygtls.h" +#include "cygwait.h" /* This is called _wait and not wait because the real wait is defined in libc/syscalls/syswait.c. It calls us. */ @@ -79,7 +80,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r) if ((waitfor = w->ev) == NULL) goto nochildren; - res = cancelable_wait (waitfor); + res = cancelable_wait (waitfor, NULL, cw_cancel | cw_cancel_self); sigproc_printf ("%d = cancelable_wait (...)", res); |