diff options
| author | Thomas Pfaff <tpfaff@gmx.net> | 2003-01-14 23:13:09 +0300 |
|---|---|---|
| committer | Thomas Pfaff <tpfaff@gmx.net> | 2003-01-14 23:13:09 +0300 |
| commit | 4a3584c84b70c3ac30645bd114c0891b1f54497b (patch) | |
| tree | d759e1b512efdaef375d6fc2985124894fd577f3 /winsup/cygwin/wait.cc | |
| parent | 35dbe799433e8a803f5605599284cdb80c8b20fc (diff) | |
Apply wait_cancel patch
Diffstat (limited to 'winsup/cygwin/wait.cc')
| -rw-r--r-- | winsup/cygwin/wait.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc index a4e7c60a2..c66df1b31 100644 --- a/winsup/cygwin/wait.cc +++ b/winsup/cygwin/wait.cc @@ -15,6 +15,7 @@ details. */ #include "cygerrno.h" #include "sigproc.h" #include "perthread.h" +#include "thread.h" /* This is called _wait and not wait because the real wait is defined in libc/syscalls/syswait.c. It calls us. */ @@ -51,6 +52,8 @@ wait4 (int intpid, int *status, int options, struct rusage *r) HANDLE waitfor; bool sawsig; + pthread_testcancel (); + while (1) { sig_dispatch_pending (0); @@ -84,7 +87,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r) if ((waitfor = w->ev) == NULL) goto nochildren; - res = WaitForSingleObject (waitfor, INFINITE); + res = pthread::cancelable_wait (waitfor, INFINITE); sigproc_printf ("%d = WaitForSingleObject (...)", res); |