* 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.

1 files changed, 12 insertions, 0 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 40b590af7..ee5704095 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -912,6 +912,8 @@ EXPORT_ALIAS (read, _read)
 extern "C" ssize_t
 pread (int fd, void *ptr, size_t len, _off64_t off)
 {
+  pthread_testcancel ();
+
   ssize_t res;
   cygheap_fdget cfd (fd);
   if (cfd < 0)
@@ -927,6 +929,8 @@ pread (int fd, void *ptr, size_t len, _off64_t off)
 extern "C" ssize_t
 pwrite (int fd, void *ptr, size_t len, _off64_t off)
 {
+  pthread_testcancel ();
+
   ssize_t res;
   cygheap_fdget cfd (fd);
   if (cfd < 0)
@@ -956,6 +960,8 @@ EXPORT_ALIAS (write, _write)
 extern "C" ssize_t
 readv (int fd, const struct iovec *const iov, const int iovcnt)
 {
+  pthread_testcancel ();
+
   extern int sigcatchers;
   const int e = get_errno ();
 
@@ -1039,6 +1045,8 @@ done:
 extern "C" ssize_t
 writev (const int fd, const struct iovec *const iov, const int iovcnt)
 {
+  pthread_testcancel ();
+
   int res = -1;
   const ssize_t tot = check_iovec_for_write (iov, iovcnt);
 
@@ -1096,6 +1104,7 @@ open (const char *unix_path, int flags, ...)
   mode_t mode = 0;
 
   syscall_printf ("open (%s, %p)", unix_path, flags);
+  pthread_testcancel ();
   myfault efault;
   if (efault.faulted (EFAULT))
     /* errno already set */;
@@ -1206,6 +1215,8 @@ close (int fd)
 
   syscall_printf ("close (%d)", fd);
 
+  pthread_testcancel ();
+
   MALLOC_CHECK;
   cygheap_fdget cfd (fd, true);
   if (cfd < 0)
@@ -1480,6 +1491,7 @@ _fstat_r (struct _reent *ptr, int fd, struct __stat32 *buf)
 extern "C" int
 fsync (int fd)
 {
+  pthread_testcancel ();
   cygheap_fdget cfd (fd);
   if (cfd < 0)
     {