From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C881A3858002; Thu, 22 Jul 2021 07:58:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C881A3858002 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] Ensure nanosleep(2) never returns negative rem X-Act-Checkin: newlib-cygwin X-Git-Author: David Allsopp X-Git-Refname: refs/heads/master X-Git-Oldrev: 44a3966577bc29ad4394c7117964dcfec5011646 X-Git-Newrev: 51a297bcbf05f332462a577563234062660e6384 Message-Id: <20210722075858.C881A3858002@sourceware.org> Date: Thu, 22 Jul 2021 07:58:58 +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: Thu, 22 Jul 2021 07:58:58 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=51a297bcbf05f332462a577563234062660e6384 commit 51a297bcbf05f332462a577563234062660e6384 Author: David Allsopp Date: Tue Jul 20 16:07:00 2021 +0100 Ensure nanosleep(2) never returns negative rem It appears to be the case that NtQueryTimer can return a negative time remaining for an unsignalled timer. The value appears to be less than the timer resolution. Signed-off-by: David Allsopp Diff: --- winsup/cygwin/cygwait.cc | 6 ++++-- winsup/cygwin/release/3.2.1 | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc index 1d6c7c9cc..dbbe1db6e 100644 --- a/winsup/cygwin/cygwait.cc +++ b/winsup/cygwin/cygwait.cc @@ -104,8 +104,10 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) sizeof tbi, NULL); /* if timer expired, TimeRemaining is negative and represents the system uptime when signalled */ - if (timeout->QuadPart < 0LL) - timeout->QuadPart = tbi.SignalState ? 0LL : tbi.TimeRemaining.QuadPart; + if (timeout->QuadPart < 0LL) { + timeout->QuadPart = tbi.SignalState || tbi.TimeRemaining.QuadPart < 0LL + ? 0LL : tbi.TimeRemaining.QuadPart; + } NtCancelTimer (_my_tls.locals.cw_timer, NULL); } diff --git a/winsup/cygwin/release/3.2.1 b/winsup/cygwin/release/3.2.1 index 4f4db622a..2a339718c 100644 --- a/winsup/cygwin/release/3.2.1 +++ b/winsup/cygwin/release/3.2.1 @@ -44,3 +44,7 @@ Bug Fixes AF_UNSPEC. As specified by POSIX and Linux, this is allowed on datagram sockets, and its effect is to reset the socket's peer address. + +- Fix nanosleep(2) returning negative rem. NtQueryTimer appears to be able to + return a negative remaining time (less than the timer resolution) for + unsignalled timers.