diff options
| author | imp <imp@FreeBSD.org> | 2019-04-13 07:46:35 +0300 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-11-04 09:03:15 +0300 |
| commit | 7346e14d44e0f5ad78759bafc218b4be61408527 (patch) | |
| tree | 1739620c08601dc375adb7630fed0c2fa7b935d4 | |
| parent | 57640bee75d18fac5ce6507f9a2c7a712ca750d8 (diff) | |
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)
| -rw-r--r-- | newlib/libc/include/sys/time.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h index c760adfbd..103f56660 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 |