Module Name: src
Committed By: yamt
Date: Fri Dec 17 22:08:19 UTC 2010
Modified Files:
src/sys/kern: kern_time.c
Log Message:
realtimerexpire: rename a confusing variable. no functional change.
(now_ms -> now_ns as it hold a nano second value)
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/kern_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.165 src/sys/kern/kern_time.c:1.166
--- src/sys/kern/kern_time.c:1.165 Thu Apr 8 11:51:13 2010
+++ src/sys/kern/kern_time.c Fri Dec 17 22:08:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.165 2010/04/08 11:51:13 njoly Exp $ */
+/* $NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.165 2010/04/08 11:51:13 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -974,7 +974,7 @@
void
realtimerexpire(void *arg)
{
- uint64_t last_val, next_val, interval, now_ms;
+ uint64_t last_val, next_val, interval, now_ns;
struct timespec now, next;
struct ptimer *pt;
int backwards;
@@ -997,17 +997,17 @@
if (!backwards && timespeccmp(&next, &now, >)) {
pt->pt_time.it_value = next;
} else {
- now_ms = timespec2ns(&now);
+ now_ns = timespec2ns(&now);
last_val = timespec2ns(&pt->pt_time.it_value);
interval = timespec2ns(&pt->pt_time.it_interval);
- next_val = now_ms +
- (now_ms - last_val + interval - 1) % interval;
+ next_val = now_ns +
+ (now_ns - last_val + interval - 1) % interval;
if (backwards)
next_val += interval;
else
- pt->pt_overruns += (now_ms - last_val) / interval;
+ pt->pt_overruns += (now_ns - last_val) / interval;
pt->pt_time.it_value.tv_sec = next_val / 1000000000;
pt->pt_time.it_value.tv_nsec = next_val % 1000000000;
