libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-03 21:45:51 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: pipes: always terminate async IO in blocking mode

Browse Source 
In blocking mode, the underlying IO must always be terminated,
one way or the other, to make sure the application knows the exact
state after returning from the IO function.  Therefore, always call
CancelIo in blocking mode.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-09-07 10:50:47 +02:00
parent 477a593693
commit 4003e3dfa1
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
winsup/cygwin/fhandler_pipe.cc
View File

@ -293,6 +293,14 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
if (evt && status == STATUS_PENDING) if (evt && status == STATUS_PENDING)
{ {
waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig); waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig);
/* If io.Status is STATUS_CANCELLED after CancelIo, IO has actually
been cancelled and io.Information contains the number of bytes
processed so far.
Otherwise IO has been finished regulary and io.Status contains
valid success or error information. */
CancelIo (get_handle ());
if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
waitret = WAIT_OBJECT_0;
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
status = io.Status; status = io.Status;
} }
@ -302,7 +310,11 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
break; break;
} }
else if (waitret == WAIT_SIGNALED) else if (waitret == WAIT_SIGNALED)
status = STATUS_THREAD_SIGNALED; {
status = STATUS_THREAD_SIGNALED;
nbytes += io.Information;
break;
}
else if (isclosed ()) /* A signal handler might have closed the fd. */ else if (isclosed ()) /* A signal handler might have closed the fd. */
{ {
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
@ -363,10 +375,7 @@ 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;
} }
@ -443,6 +452,14 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
if (evt && status == STATUS_PENDING) if (evt && status == STATUS_PENDING)
{ {
waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig); waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig);
/* If io.Status is STATUS_CANCELLED after CancelIo, IO has actually
been cancelled and io.Information contains the number of bytes
processed so far.
Otherwise IO has been finished regulary and io.Status contains
valid success or error information. */
CancelIo (get_handle ());
if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
waitret = WAIT_OBJECT_0;
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
status = io.Status; status = io.Status;
} }
@ -452,7 +469,11 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
break; break;
} }
else if (waitret == WAIT_SIGNALED) else if (waitret == WAIT_SIGNALED)
status = STATUS_THREAD_SIGNALED; {
status = STATUS_THREAD_SIGNALED;
nbytes += io.Information;
break;
}
else if (isclosed ()) /* A signal handler might have closed the fd. */ else if (isclosed ()) /* A signal handler might have closed the fd. */
{ {
if (waitret == WAIT_OBJECT_0) if (waitret == WAIT_OBJECT_0)
@ -485,10 +506,7 @@ 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;
} }