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: handle signals and thread cancellation in blocking mode only
Date: Tue, 14 Sep 2021 15:07:04 +0000 (GMT) [thread overview]
Message-ID: <20210914150704.B30013857C6F@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9d7fd8d416e678b453fafff8590cd1ec7027c42b
commit 9d7fd8d416e678b453fafff8590cd1ec7027c42b
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Tue Sep 7 11:14:09 2021 +0200
Cygwin: pipes: handle signals and thread cancellation in blocking mode only
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/fhandler_pipe.cc | 56 +++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 8041a5d51..4bd807a09 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -301,21 +301,21 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
CancelIo (get_handle ());
if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
waitret = WAIT_OBJECT_0;
- if (waitret == WAIT_OBJECT_0)
- status = io.Status;
- }
- if (waitret == WAIT_CANCELED)
- {
- status = STATUS_THREAD_CANCELED;
- break;
- }
- else if (waitret == WAIT_SIGNALED)
- {
- status = STATUS_THREAD_SIGNALED;
- nbytes += io.Information;
- break;
+
+ if (waitret == WAIT_CANCELED)
+ {
+ status = STATUS_THREAD_CANCELED;
+ break;
+ }
+ else if (waitret == WAIT_SIGNALED)
+ {
+ status = STATUS_THREAD_SIGNALED;
+ nbytes += io.Information;
+ break;
+ }
+ status = io.Status;
}
- else if (isclosed ()) /* A signal handler might have closed the fd. */
+ if (isclosed ()) /* A signal handler might have closed the fd. */
{
if (waitret == WAIT_OBJECT_0)
set_errno (EBADF);
@@ -460,21 +460,21 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
CancelIo (get_handle ());
if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
waitret = WAIT_OBJECT_0;
- if (waitret == WAIT_OBJECT_0)
- status = io.Status;
- }
- if (waitret == WAIT_CANCELED)
- {
- status = STATUS_THREAD_CANCELED;
- break;
- }
- else if (waitret == WAIT_SIGNALED)
- {
- status = STATUS_THREAD_SIGNALED;
- nbytes += io.Information;
- break;
+
+ if (waitret == WAIT_CANCELED)
+ {
+ status = STATUS_THREAD_CANCELED;
+ break;
+ }
+ else if (waitret == WAIT_SIGNALED)
+ {
+ status = STATUS_THREAD_SIGNALED;
+ nbytes += io.Information;
+ break;
+ }
+ status = io.Status;
}
- else if (isclosed ()) /* A signal handler might have closed the fd. */
+ if (isclosed ()) /* A signal handler might have closed the fd. */
{
if (waitret == WAIT_OBJECT_0)
set_errno (EBADF);
reply other threads:[~2021-09-14 15:07 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=20210914150704.B30013857C6F@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: link
Be 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).