public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_3-branch] Cygwin: pipe: Handle WAIT_CANCELED when waiting read_mtx.
@ 2021-11-10 12:40 Takashi Yano
  0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2021-11-10 12:40 UTC (permalink / raw)
  To: cygwin-cvs

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)
     {


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-11-10 12:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-10 12:40 [newlib-cygwin/cygwin-3_3-branch] Cygwin: pipe: Handle WAIT_CANCELED when waiting read_mtx Takashi Yano

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).