drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pipes: cancel async IO if thread cancellation is in progress 

Just cancelling a thread doesn't cancel async IO started by this thread.
Fix this by returning from cygwait and calling CancelIo before canceling
self.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-09-06 14:35:05 +02:00
parent fadbedd9ca
commit 477a593693
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
winsup/cygwin/fhandler_pipe.cc
View File

@ -292,12 +292,15 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
len1, NULL, NULL); len1, NULL, NULL);
if (evt && status == STATUS_PENDING) if (evt && status == STATUS_PENDING)
{ {
waitret = cygwait (evt); waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig);
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
status = io.Status; status = io.Status;
} }
if (waitret == WAIT_CANCELED) if (waitret == WAIT_CANCELED)
status = STATUS_THREAD_CANCELED; {
status = STATUS_THREAD_CANCELED;
break;
}
else if (waitret == WAIT_SIGNALED) else if (waitret == WAIT_SIGNALED)
status = STATUS_THREAD_SIGNALED; status = STATUS_THREAD_SIGNALED;
else if (isclosed ()) /* A signal handler might have closed the fd. */ else if (isclosed ()) /* A signal handler might have closed the fd. */
@ -360,7 +363,10 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
nbytes = (size_t) -1; nbytes = (size_t) -1;
} }
else if (status == STATUS_THREAD_CANCELED) else if (status == STATUS_THREAD_CANCELED)
pthread::static_cancel_self (); {
CancelIo (get_handle ());
pthread::static_cancel_self ();
}
len = nbytes; len = nbytes;
} }
@ -436,12 +442,15 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
} }
if (evt && status == STATUS_PENDING) if (evt && status == STATUS_PENDING)
{ {
waitret = cygwait (evt); waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig);
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
status = io.Status; status = io.Status;
} }
if (waitret == WAIT_CANCELED) if (waitret == WAIT_CANCELED)
status = STATUS_THREAD_CANCELED; {
status = STATUS_THREAD_CANCELED;
break;
}
else if (waitret == WAIT_SIGNALED) else if (waitret == WAIT_SIGNALED)
status = STATUS_THREAD_SIGNALED; status = STATUS_THREAD_SIGNALED;
else if (isclosed ()) /* A signal handler might have closed the fd. */ else if (isclosed ()) /* A signal handler might have closed the fd. */
@ -476,7 +485,10 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
if (status == STATUS_THREAD_SIGNALED && nbytes == 0) if (status == STATUS_THREAD_SIGNALED && nbytes == 0)
set_errno (EINTR); set_errno (EINTR);
else if (status == STATUS_THREAD_CANCELED) else if (status == STATUS_THREAD_CANCELED)
pthread::static_cancel_self (); {
CancelIo (get_handle ());
pthread::static_cancel_self ();
}
return nbytes ?: -1; return nbytes ?: -1;
} }