From 1804be048ac341df4162dc954e7319adb4ce915c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 30 Apr 2011 16:34:48 +0000 Subject: * 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. --- winsup/cygwin/fhandler_socket.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'winsup/cygwin/fhandler_socket.cc') diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index d0cf205a6..1151f89fe 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1026,6 +1026,8 @@ fhandler_socket::connect (const struct sockaddr *name, int namelen) DWORD err; int type; + pthread_testcancel (); + if (!get_inet_addr (name, namelen, &sst, &namelen, &type, connect_secret)) return -1; @@ -1140,6 +1142,8 @@ fhandler_socket::accept4 (struct sockaddr *peer, int *len, int flags) struct sockaddr_storage lpeer; int llen = sizeof (struct sockaddr_storage); + pthread_testcancel (); + int res = 0; while (!(res = wait_for_events (FD_ACCEPT | FD_CLOSE, 0)) && (res = ::accept (get_socket (), (struct sockaddr *) &lpeer, &llen)) @@ -1473,6 +1477,8 @@ ssize_t fhandler_socket::recvfrom (void *ptr, size_t len, int flags, struct sockaddr *from, int *fromlen) { + pthread_testcancel (); + WSABUF wsabuf = { len, (char *) ptr }; WSAMSG wsamsg = { from, from && fromlen ? *fromlen : 0, &wsabuf, 1, @@ -1487,6 +1493,8 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags, ssize_t fhandler_socket::recvmsg (struct msghdr *msg, int flags) { + pthread_testcancel (); + /* TODO: Descriptor passing on AF_LOCAL sockets. */ /* Disappointing but true: Even if WSARecvMsg is supported, it's only @@ -1626,6 +1634,8 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags, { struct sockaddr_storage sst; + pthread_testcancel (); + if (to && !get_inet_addr (to, tolen, &sst, &tolen)) return SOCKET_ERROR; @@ -1640,6 +1650,8 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags, int fhandler_socket::sendmsg (const struct msghdr *msg, int flags) { + pthread_testcancel (); + /* TODO: Descriptor passing on AF_LOCAL sockets. */ WSABUF wsabuf[msg->msg_iovlen]; -- cgit v1.2.3