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: cancel async IO if thread cancellation is in progress Date: Tue, 14 Sep 2021 15:06:54 +0000 (GMT) [thread overview] Message-ID: <20210914150654.A7754385781D@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=477a593693076ce252ee463c4d06a9fa12a00d02 commit 477a593693076ce252ee463c4d06a9fa12a00d02 Author: Corinna Vinschen <corinna@vinschen.de> Date: Mon Sep 6 14:35:05 2021 +0200 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> Diff: --- winsup/cygwin/fhandler_pipe.cc | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc index fe0bf0ca2..76ce895e2 100644 --- a/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc @@ -292,12 +292,15 @@ fhandler_pipe::raw_read (void *ptr, size_t& len) len1, NULL, NULL); if (evt && status == STATUS_PENDING) { - waitret = cygwait (evt); + waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig); if (waitret == WAIT_OBJECT_0) status = io.Status; } if (waitret == WAIT_CANCELED) - status = STATUS_THREAD_CANCELED; + { + status = STATUS_THREAD_CANCELED; + break; + } else if (waitret == WAIT_SIGNALED) status = STATUS_THREAD_SIGNALED; 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; } else if (status == STATUS_THREAD_CANCELED) - pthread::static_cancel_self (); + { + CancelIo (get_handle ()); + pthread::static_cancel_self (); + } len = nbytes; } @@ -436,12 +442,15 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len) } if (evt && status == STATUS_PENDING) { - waitret = cygwait (evt); + waitret = cygwait (evt, INFINITE, cw_cancel | cw_sig); if (waitret == WAIT_OBJECT_0) status = io.Status; } if (waitret == WAIT_CANCELED) - status = STATUS_THREAD_CANCELED; + { + status = STATUS_THREAD_CANCELED; + break; + } else if (waitret == WAIT_SIGNALED) status = STATUS_THREAD_SIGNALED; 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) set_errno (EINTR); else if (status == STATUS_THREAD_CANCELED) - pthread::static_cancel_self (); + { + CancelIo (get_handle ()); + 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=20210914150654.A7754385781D@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).