[newlib-cygwin/cygwin-3_3-branch] Cygwin: pipe: Handle WAIT_CANCELED when waiting read_mtx.
Takashi Yano
tyan0@sourceware.org
Wed Nov 10 12:40:37 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=08253fae73d03787dc868994321276861f413206
commit 08253fae73d03787dc868994321276861f413206
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Wed Nov 10 12:24:53 2021 +0900
Cygwin: pipe: Handle WAIT_CANCELED when waiting read_mtx.
- Add missing handling for WAIT_CANCELED in cygwait() for read_mtx
in raw_read().
Diff:
---
winsup/cygwin/fhandler_pipe.cc | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 724944336..ccb106ea7 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -302,10 +302,18 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
set_errno (EAGAIN);
len = (size_t) -1;
return;
- default:
+ case WAIT_SIGNALED:
set_errno (EINTR);
len = (size_t) -1;
return;
+ case WAIT_CANCELED:
+ pthread::static_cancel_self ();
+ /* NOTREACHED */
+ default:
+ /* Should not reach here. */
+ __seterrno ();
+ len = (size_t) -1;
+ return;
}
while (nbytes < len)
{
More information about the Cygwin-cvs
mailing list