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

Handle double fraction overflow in nano & microtime functions (spotted by Bruce)

Browse Source 
Use tvtohz() a place where it fits.
This commit is contained in:
Poul-Henning Kamp 1998-04-04 18:46:13 +00:00
parent c90cdf29ba
commit 91ad39c6b3
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_clock.c
View File

@ -39,7 +39,7 @@ static volatile int print_tci = 1;
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.62 1998/03/31 10:47:01 phk Exp $
* $Id: kern_clock.c,v 1.63 1998/04/04 13:25:11 phk Exp $
*/
#include <sys/param.h>
@ -532,7 +532,7 @@ microtime(struct timeval *tv)
((u_int64_t)tc->get_timedelta(tc) * tc->scale_micro) >> 32;
tv->tv_usec += boottime.tv_usec;
tv->tv_sec += boottime.tv_sec;
if (tv->tv_usec >= 1000000) {
while (tv->tv_usec >= 1000000) {
tv->tv_usec -= 1000000;
tv->tv_sec++;
}
@ -554,7 +554,7 @@ nanotime(struct timespec *tv)
delta += ((u_int64_t)count * tc->scale_nano_i);
delta += boottime.tv_usec * 1000;
tv->tv_sec += boottime.tv_sec;
if (delta >= 1000000000) {
while (delta >= 1000000000) {
delta -= 1000000000;
tv->tv_sec++;
}

6
sys/kern/kern_tc.c
View File

@ -39,7 +39,7 @@ static volatile int print_tci = 1;
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.62 1998/03/31 10:47:01 phk Exp $
* $Id: kern_clock.c,v 1.63 1998/04/04 13:25:11 phk Exp $
*/
#include <sys/param.h>
@ -532,7 +532,7 @@ microtime(struct timeval *tv)
((u_int64_t)tc->get_timedelta(tc) * tc->scale_micro) >> 32;
tv->tv_usec += boottime.tv_usec;
tv->tv_sec += boottime.tv_sec;
if (tv->tv_usec >= 1000000) {
while (tv->tv_usec >= 1000000) {
tv->tv_usec -= 1000000;
tv->tv_sec++;
}
@ -554,7 +554,7 @@ nanotime(struct timespec *tv)
delta += ((u_int64_t)count * tc->scale_nano_i);
delta += boottime.tv_usec * 1000;
tv->tv_sec += boottime.tv_sec;
if (delta >= 1000000000) {
while (delta >= 1000000000) {
delta -= 1000000000;
tv->tv_sec++;
}

9
sys/kern/kern_time.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_time.c 8.1 (Berkeley) 6/10/93
* $Id: kern_time.c,v 1.44 1998/03/30 09:50:23 phk Exp $
* $Id: kern_time.c,v 1.45 1998/04/04 13:25:25 phk Exp $
*/
#include <sys/param.h>
@ -536,12 +536,9 @@ setitimer(p, uap)
if (uap->which == ITIMER_REAL) {
if (timerisset(&p->p_realtimer.it_value))
untimeout(realitexpire, (caddr_t)p, p->p_ithandle);
if (timerisset(&aitv.it_value)) {
getmicrotime(&ctv);
timevaladd(&aitv.it_value, &ctv);
if (timerisset(&aitv.it_value))
p->p_ithandle = timeout(realitexpire, (caddr_t)p,
hzto(&aitv.it_value));
}
tvtohz(&aitv.it_value));
p->p_realtimer = aitv;
} else
p->p_stats->p_timer[uap->which] = aitv;