diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-30 20:34:48 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-30 20:34:48 +0400 |
| commit | 1804be048ac341df4162dc954e7319adb4ce915c (patch) | |
| tree | db6bff3c9af11a7371b343064e6d3f9a03b5acb1 /winsup/cygwin/posix_ipc.cc | |
| parent | cbec4110a232424225633a593512969aa8e10ac8 (diff) | |
* fcntl.cc (fcntl64): Call pthread_testcancel.
* fhandler_socket.cc (fhandler_socket::connect): Ditto.
(fhandler_socket::accept4): Ditto.
(fhandler_socket::recvfrom): Ditto.
(fhandler_socket::recvmsg): Ditto.
(fhandler_socket::sendto): Ditto.
(fhandler_socket::sendmsg): Ditto.
* flock.cc (lf_setlock): Allow to cancel thread running blocking
file lock. Try to make code more readable.
(lockf): Call pthread_testcancel.
* mmap.cc (msync): Ditto.
* posix_ipc.cc (ipc_cond_timedwait): Call pthread::static_cancel_self
rather than pthread_testcancel.
* select.cc (cygwin_select): Call pthread_testcancel.
* syscalls.cc (pread): Ditto.
(pwrite): Ditto.
(readv): Ditto.
(writev): Ditto.
(open): Ditto.
(close): Ditto.
(fsync): Ditto.
* termios.cc (tcdrain): Ditto.
* thread.cc: Align list of cancellation points with above changes.
Mark not-implemented functions, too.
(cancelable_wait): Don't set unused object indices to WAIT_FAILED
since that could result in wrong behaviour. Set them to the invalid
value WAIT_TIMEOUT + 1 instead.
Diffstat (limited to 'winsup/cygwin/posix_ipc.cc')
| -rw-r--r-- | winsup/cygwin/posix_ipc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/posix_ipc.cc b/winsup/cygwin/posix_ipc.cc index 88f5a2e5e..ec6b6c76a 100644 --- a/winsup/cygwin/posix_ipc.cc +++ b/winsup/cygwin/posix_ipc.cc @@ -227,7 +227,7 @@ restart1: break; case WAIT_OBJECT_0 + 2: if (timer_idx != 2) - pthread_testcancel (); + pthread::static_cancel_self (); /*FALLTHRU*/ case WAIT_OBJECT_0 + 3: ret = ETIMEDOUT; |