public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: pipe: Fix performance degradation for non-cygwin pipe.
Date: Fri,  9 Dec 2022 12:04:24 +0000 (GMT)	[thread overview]
Message-ID: <20221209120424.62CA238432E5@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=540e5448fc988fd02903558a9bb75a8cd3e6b2a8

commit 540e5448fc988fd02903558a9bb75a8cd3e6b2a8
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Thu Dec 8 22:02:43 2022 +0900

    Cygwin: pipe: Fix performance degradation for non-cygwin pipe.
    
    https://cygwin.com/pipermail/cygwin/2022-December/252628.html
    
    After the commit 9e4d308cd592, the performance of read from non-cygwin
    pipe has been degraded. This is because select_sem mechanism does not
    work for non-cygwin pipe. This patch fixes the issue.
    
    Fixes: 9e4d308cd592 ("Cygwin: pipe: Adopt FILE_SYNCHRONOUS_IO_NONALERT
    flag for read pipe.")
    Reported-by: tryandbuy <tryandbuy@proton.me>
    Reviewed-by: Corinna Vinschen <corinna@vinschen.de>
    Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>

Diff:
---
 winsup/cygwin/fhandler/pipe.cc | 16 +++++++++++++++-
 winsup/cygwin/release/3.4.1    |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
index 720e4efd3..e23131668 100644
--- a/winsup/cygwin/fhandler/pipe.cc
+++ b/winsup/cygwin/fhandler/pipe.cc
@@ -281,6 +281,8 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
   size_t nbytes = 0;
   NTSTATUS status = STATUS_SUCCESS;
   IO_STATUS_BLOCK io;
+  ULONGLONG t0 = GetTickCount64 (); /* Init timer */
+  const ULONGLONG t0_threshold = 20;
 
   if (!len)
     return;
@@ -312,6 +314,7 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
     {
       ULONG_PTR nbytes_now = 0;
       ULONG len1 = (ULONG) (len - nbytes);
+      DWORD select_sem_timeout = 0;
 
       FILE_PIPE_LOCAL_INFORMATION fpli;
       status = NtQueryInformationFile (get_handle (), &io,
@@ -358,7 +361,18 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
 		  nbytes = (size_t) -1;
 		  break;
 		}
-	      waitret = cygwait (select_sem, 1);
+	      /* If the pipe is a non-cygwin pipe, select_sem trick
+		 does not work. As a result, the following cygwait()
+		 will return only after timeout occurs. This causes
+		 performance degradation. However, setting timeout
+		 to zero causes high CPU load. So, set timeout to
+		 non-zero only when select_sem is valid or pipe is
+		 not ready to read for more than t0_threshold.
+		 This prevents both the performance degradation and
+		 the high CPU load. */
+	      if (select_sem || GetTickCount64 () - t0 > t0_threshold)
+		select_sem_timeout = 1;
+	      waitret = cygwait (select_sem, select_sem_timeout);
 	      if (waitret == WAIT_CANCELED)
 		pthread::static_cancel_self ();
 	      else if (waitret == WAIT_SIGNALED)
diff --git a/winsup/cygwin/release/3.4.1 b/winsup/cygwin/release/3.4.1
index 226329d9c..9a831eda5 100644
--- a/winsup/cygwin/release/3.4.1
+++ b/winsup/cygwin/release/3.4.1
@@ -10,3 +10,6 @@ Bug Fixes
   compiled under Cygwin 3.4.0 having a public facing interface using
   FILE need to be recompiled.
   Addresses: https://savannah.gnu.org/bugs/index.php?63480
+
+- Fix performance degradation of non-cygwin pipe.
+  Addresses: https://cygwin.com/pipermail/cygwin/2022-December/252628.html

                 reply	other threads:[~2022-12-09 12:04 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=20221209120424.62CA238432E5@sourceware.org \
    --to=tyan0@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).