d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sbttons for values > 2s

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

Discussed with: bde@ (quite some time ago, for an earlier version)
This commit is contained in:
Warner Losh 2019-04-13 04:46:35 +00:00
parent f20b149b45
commit 6758096403
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/sys/time.h
View File

@ -184,8 +184,18 @@ sbttobt(sbintime_t _sbt)
static __inline int64_t static __inline int64_t
sbttons(sbintime_t _sbt) sbttons(sbintime_t _sbt)
{ {
uint64_t ns;
return ((1000000000 * _sbt) >> 32); #ifdef KASSERT
KASSERT(_sbt >= 0, ("Negative values illegal for sbttons: %jx", _sbt));
#endif
ns = _sbt;
if (ns >= SBT_1S)
ns = (ns >> 32) * 1000000000;
else
ns = 0;
return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32));
} }
static __inline sbintime_t static __inline sbintime_t