From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 56861 invoked by alias); 4 Nov 2019 06:05:06 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 56819 invoked by uid 10080); 4 Nov 2019 06:05:06 -0000 Date: Mon, 04 Nov 2019 06:05:00 -0000 Message-ID: <20191104060506.56818.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Fix sbttons for values > 2s X-Act-Checkin: newlib-cygwin X-Git-Author: imp X-Git-Refname: refs/heads/master X-Git-Oldrev: 57640bee75d18fac5ce6507f9a2c7a712ca750d8 X-Git-Newrev: 7346e14d44e0f5ad78759bafc218b4be61408527 X-SW-Source: 2019-q4/txt/msg00011.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7346e14d44e0f5ad78759bafc218b4be61408527 commit 7346e14d44e0f5ad78759bafc218b4be61408527 Author: imp Date: Sat Apr 13 04:46:35 2019 +0000 Fix sbttons for values > 2s Add test against negative times. Add code to cope with larger values properly. Discussed with: bde@ (quite some time ago, for an earlier version) Diff: --- newlib/libc/include/sys/time.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h index c760adf..103f566 100644 --- a/newlib/libc/include/sys/time.h +++ b/newlib/libc/include/sys/time.h @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.5 (Berkeley) 5/4/95 - * $FreeBSD: head/sys/sys/time.h 340664 2018-11-20 07:11:23Z imp $ + * $FreeBSD: head/sys/sys/time.h 346176 2019-04-13 04:46:35Z imp $ */ #ifndef _SYS_TIME_H_ @@ -191,8 +191,15 @@ sbttobt(sbintime_t _sbt) static __inline int64_t sbttons(sbintime_t _sbt) { + uint64_t ns; - return ((1000000000 * _sbt) >> 32); + ns = _sbt; + if (ns >= SBT_1S) + ns = (ns >> 32) * 1000000000; + else + ns = 0; + + return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32)); } static __inline sbintime_t