From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 5B74B3881D2F; Fri, 9 Dec 2022 12:01:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B74B3881D2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670587318; bh=n7xuiIQEv7n+Ys+uvI6LPzPGpJSfcbYYwhtWHcPKvoA=; h=From:To:Subject:Date:From; b=TvEEhdf3+0XDQA7uOHKyED2nsvIfgbrJmk152cuUeuNdUBDu2ZCEPp+IajHsIJeog My8sHpnu1svhDu15Pya0BmruTyttq6v/AJkMc5MCRgOhA6v3o8zJ4DJoJYzvrOesWA Fs/QN+A60q3Hu3wlpa2k23SdVLJk+3EY8jIA7oVY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Use GetTickCount64() instead of GetTickCount(). X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: be635ebc2f5df7f07ebc3f1f9531f38e3c09c970 X-Git-Newrev: faac79783c27c030ab17a6f298f8aa89c51a03c5 Message-Id: <20221209120158.5B74B3881D2F@sourceware.org> Date: Fri, 9 Dec 2022 12:01:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dfaac79783c2= 7c030ab17a6f298f8aa89c51a03c5 commit faac79783c27c030ab17a6f298f8aa89c51a03c5 Author: Takashi Yano Date: Fri Dec 9 10:12:02 2022 +0900 Cygwin: pty: Use GetTickCount64() instead of GetTickCount(). =20 Suggested-by: Corinna Vinschen Signed-off-by: Takashi Yano Diff: --- winsup/cygwin/fhandler/pty.cc | 2 +- winsup/cygwin/local_includes/tty.h | 2 +- winsup/cygwin/tty.cc | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc index e7106daba..c9b05e3d7 100644 --- a/winsup/cygwin/fhandler/pty.cc +++ b/winsup/cygwin/fhandler/pty.cc @@ -2691,7 +2691,7 @@ fhandler_pty_master::pty_master_fwd_thread (const mas= ter_fwd_thread_param_t *p) termios_printf ("Started."); for (;;) { - p->ttyp->fwd_last_time =3D GetTickCount (); + p->ttyp->fwd_last_time =3D GetTickCount64 (); DWORD n; p->ttyp->fwd_not_empty =3D ::bytes_available (n, p->from_slave_nat) && n; diff --git a/winsup/cygwin/local_includes/tty.h b/winsup/cygwin/local_inclu= des/tty.h index 3d0ea0c68..cd1d6ecaa 100644 --- a/winsup/cygwin/local_includes/tty.h +++ b/winsup/cygwin/local_includes/tty.h @@ -119,7 +119,7 @@ private: bool switch_to_nat_pipe; DWORD nat_pipe_owner_pid; UINT term_code_page; - DWORD fwd_last_time; + ULONGLONG fwd_last_time; bool fwd_not_empty; HANDLE h_pcon_write_pipe; HANDLE h_pcon_condrv_reference; diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc index a862a444e..6ec8927cb 100644 --- a/winsup/cygwin/tty.cc +++ b/winsup/cygwin/tty.cc @@ -319,13 +319,13 @@ tty::wait_fwd () 16-32 msec even if it already has data to transfer. If the time without transfer exceeds 32 msec, the forwarding is supposed to be finished. fwd_last_time - is reset to GetTickCount() in pty master forwarding + is reset to GetTickCount64() in pty master forwarding thread when the last data is transfered. */ - const int sleep_in_nat_pipe =3D 16; - const int time_to_wait =3D sleep_in_nat_pipe * 2 + 1/* margine */; - int elapsed; + const ULONGLONG sleep_in_nat_pipe =3D 16; + const ULONGLONG time_to_wait =3D sleep_in_nat_pipe * 2 + 1/* margine */; + ULONGLONG elapsed; while (fwd_not_empty - || (elapsed =3D GetTickCount () - fwd_last_time) < time_to_wait) + || (elapsed =3D GetTickCount64 () - fwd_last_time) < time_to_wait) { int tw =3D fwd_not_empty ? 10 : (time_to_wait - elapsed); cygwait (tw);