[1/4] Fix sbttons for values > 2s

Message ID 20190924070054.24447-2-sebastian.huber@embedded-brains.de
State Accepted
Commit 7346e14d44e0f5ad78759bafc218b4be61408527
Headers show
Series
  • Synchronize <sys/time.h>, etc. with FreeBSD
Related show

Commit Message

Sebastian Huber Sept. 24, 2019, 7 a.m.
From: imp <imp@FreeBSD.org>


Add test against negative times. Add code to cope with larger values
properly.

Discussed with: bde@ (quite some time ago, for an earlier version)
---
 newlib/libc/include/sys/time.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

-- 
2.16.4

Patch

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