public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pipes: always terminate async IO in blocking mode Date: Tue, 14 Sep 2021 15:06:59 +0000 (GMT) [thread overview] Message-ID: <20210914150659.ABECD385781B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=4003e3dfa1b9bfee12d686f016353a1e20b51e74 commit 4003e3dfa1b9bfee12d686f016353a1e20b51e74 Author: Corinna Vinschen <corinna@vinschen.de> Date: Tue Sep 7 10:50:47 2021 +0200 Cygwin: pipes: always terminate async IO in blocking mode 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> Diff: --- winsup/cygwin/fhandler_pipe.cc | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc index 76ce895e2..8041a5d51 100644 --- a/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc @@ -293,6 +293,14 @@ fhandler_pipe::raw_read (void *ptr, size_t& len) if (evt && status == STATUS_PENDING) { 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) status = io.Status; } @@ -302,7 +310,11 @@ fhandler_pipe::raw_read (void *ptr, size_t& len) break; } 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. */ { if (waitret == WAIT_OBJECT_0) @@ -363,10 +375,7 @@ fhandler_pipe::raw_read (void *ptr, size_t& len) nbytes = (size_t) -1; } else if (status == STATUS_THREAD_CANCELED) - { - CancelIo (get_handle ()); - pthread::static_cancel_self (); - } + pthread::static_cancel_self (); len = nbytes; } @@ -443,6 +452,14 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len) if (evt && status == STATUS_PENDING) { 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) status = io.Status; } @@ -452,7 +469,11 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len) break; } 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. */ { 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) set_errno (EINTR); else if (status == STATUS_THREAD_CANCELED) - { - CancelIo (get_handle ()); - pthread::static_cancel_self (); - } + pthread::static_cancel_self (); return nbytes ?: -1; }
reply other threads:[~2021-09-14 15:06 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210914150659.ABECD385781B@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).