From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 57CB1386EC75; Mon, 14 Dec 2020 10:02:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57CB1386EC75 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Revise the code for timeout in term_has_pcon_cap(). X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: c2c33e4d673f630a4f85ef8339e3456384e94850 X-Git-Newrev: 55eff668b878fe6571cd363a4ce80dd0b1d718da Message-Id: <20201214100250.57CB1386EC75@sourceware.org> Date: Mon, 14 Dec 2020 10:02:50 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 10:02:50 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=55eff668b878fe6571cd363a4ce80dd0b1d718da commit 55eff668b878fe6571cd363a4ce80dd0b1d718da Author: Takashi Yano via Cygwin-patches Date: Mon Dec 14 17:26:09 2020 +0900 Cygwin: pty: Revise the code for timeout in term_has_pcon_cap(). - Sometimes timeout period in term_has_pcon_cap() may not be enough when the machine slows down for some reason. This patch eases the issue. In the new code, effective timeout period is expected to be extended as a result due to slowing-down the wait loop as well when the machine gets into busy. Diff: --- winsup/cygwin/fhandler_tty.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 845e51184..04a9a2bf5 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -2651,7 +2651,7 @@ fhandler_pty_slave::term_has_pcon_cap (const WCHAR *env) char *p; int len; int x1, y1, x2, y2; - DWORD t0; + int wait_cnt = 0; /* Check if terminal has ANSI escape sequence. */ if (!has_ansi_escape_sequences (env)) @@ -2668,7 +2668,6 @@ fhandler_pty_slave::term_has_pcon_cap (const WCHAR *env) ReleaseMutex (input_mutex); p = buf; len = sizeof (buf) - 1; - t0 = GetTickCount (); do { if (::bytes_available (n, get_handle ()) && n) @@ -2680,9 +2679,10 @@ fhandler_pty_slave::term_has_pcon_cap (const WCHAR *env) char *p1 = strrchr (buf, '\033'); if (p1 == NULL || sscanf (p1, "\033[%d;%dR", &y1, &x1) != 2) continue; + wait_cnt = 0; break; } - else if (GetTickCount () - t0 > 40) /* Timeout */ + else if (++wait_cnt > 100) /* Timeout */ goto not_has_csi6n; else Sleep (1);