 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_time.c,v 1.170 2011/10/27 16:12:52 christos Exp $	*/
+/*	$NetBSD: kern_time.c,v 1.171 2011/12/18 22:30:25 christos Exp $	*/
 /*-
  * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christopher G. Demetriou, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_time.c	8.4 (Berkeley) 5/26/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.170 2011/10/27 16:12:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.171 2011/12/18 22:30:25 christos Exp $");
 #include <sys/param.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/syslog.h>
 #include <sys/timetc.h>
 #include <sys/timex.h>
 #include <sys/kauth.h>
 #include <sys/mount.h>
 @@ -664,27 +664,30 @@ timer_settime(struct ptimer *pt)
+{
 	struct ptimer *ptn, *pptn;
 	struct ptlist *ptl;
 	KASSERT(mutex_owned(&timer_lock));
 	if (!CLOCK_VIRTUAL_P(pt->pt_type)) {
 		callout_halt(&pt->pt_ch, &timer_lock);
 		if (timespecisset(&pt->pt_time.it_value)) {
 			/*
 			 * Don't need to check tshzto() return value, here.
 			 * callout_reset() does it for us.
 			 */
-			callout_reset(&pt->pt_ch, tshzto(&pt->pt_time.it_value),
+			callout_reset(&pt->pt_ch,
 			    pt->pt_type == CLOCK_MONOTONIC ?
 			    tshztoup(&pt->pt_time.it_value) :
 			    tshzto(&pt->pt_time.it_value),
 			    realtimerexpire, pt);
+		}
 	} else {
 		if (pt->pt_active) {
 			ptn = LIST_NEXT(pt, pt_list);
 			LIST_REMOVE(pt, pt_list);
 			for ( ; ptn; ptn = LIST_NEXT(ptn, pt_list))
 				timespecadd(&pt->pt_time.it_value,
 				    &ptn->pt_time.it_value,
 				    &ptn->pt_time.it_value);
+		}
 		if (timespecisset(&pt->pt_time.it_value)) {
 			if (pt->pt_type == CLOCK_VIRTUAL)
 @@ -994,54 +997,59 @@ realtimerexpire(void *arg)
 	int backwards;
 	pt = arg;
 	mutex_spin_enter(&timer_lock);
 	itimerfire(pt);
 	if (!timespecisset(&pt->pt_time.it_interval)) {
 		timespecclear(&pt->pt_time.it_value);
 		mutex_spin_exit(&timer_lock);
 		return;
+	}
-	getnanotime(&now);
+	if (pt->pt_type == CLOCK_MONOTONIC) {
 		getnanouptime(&now);
 	} else {
 		getnanotime(&now);
+	}
 	backwards = (timespeccmp(&pt->pt_time.it_value, &now, >));
 	timespecadd(&pt->pt_time.it_value, &pt->pt_time.it_interval, &next);
 	/* Handle the easy case of non-overflown timers first. */
 	if (!backwards && timespeccmp(&next, &now, >)) {
 		pt->pt_time.it_value = next;
 	} else {
 		now_ns = timespec2ns(&now);
 		last_val = timespec2ns(&pt->pt_time.it_value);
 		interval = timespec2ns(&pt->pt_time.it_interval);
 		next_val = now_ns +
 		    (now_ns - last_val + interval - 1) % interval;
 		if (backwards)
 			next_val += interval;
 		else
 			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;
+	}
 	/*
 	 * Don't need to check tshzto() return value, here.
 	 * callout_reset() does it for us.
 	 */
-	callout_reset(&pt->pt_ch, tshzto(&pt->pt_time.it_value),
+	callout_reset(&pt->pt_ch, pt->pt_type == CLOCK_MONOTONIC ?
 	    tshztoup(&pt->pt_time.it_value) : tshzto(&pt->pt_time.it_value),
 	    realtimerexpire, pt);
 	mutex_spin_exit(&timer_lock);
+}
 /* BSD routine to get the value of an interval timer. */
 /* ARGSUSED */
 int
 sys___getitimer50(struct lwp *l, const struct sys___getitimer50_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(struct itimerval *) itv;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_time.c,v 1.8 2011/01/26 19:15:13 drochner Exp $	*/
+/*	$NetBSD: subr_time.c,v 1.9 2011/12/18 22:30:25 christos Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
  *	@(#)kern_time.c 8.4 (Berkeley) 5/26/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.8 2011/01/26 19:15:13 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.9 2011/12/18 22:30:25 christos Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/timex.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/intr.h>
 /*
  * Compute number of hz until specified time.  Used to compute second
  * argument to callout_reset() from an absolute time.
  */
 int
 @@ -119,26 +119,38 @@ tvtohz(const struct timeval *tv)
 	return ((int)ticks);
+}
 int
 tshzto(const struct timespec *tsp)
+{
 	struct timespec now, ts;
 	ts = *tsp;	/* Don't modify original tsp. */
 	getnanotime(&now);
 	timespecsub(&ts, &now, &ts);
 	return tstohz(&ts);
+}
 int
 tshztoup(const struct timespec *tsp)
+{
 	struct timespec now, ts;
 	ts = *tsp;	/* Don't modify original tsp. */
 	getnanouptime(&now);
 	timespecsub(&ts, &now, &ts);
 	return tstohz(&ts);
+}
 /*
  * Compute number of ticks in the specified amount of time.
  */
 int
 tstohz(const struct timespec *ts)
+{
 	struct timeval tv;
 	/*
 	 * usec has great enough resolution for hz, so convert to a
 	 * timeval and use tvtohz() above.
 	 */
 	TIMESPEC_TO_TIMEVAL(&tv, ts);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timevar.h,v 1.29 2010/04/08 11:51:13 njoly Exp $	*/
+/*	$NetBSD: timevar.h,v 1.30 2011/12/18 22:30:25 christos Exp $	*/
 /*
  *  Copyright (c) 2005, 2008 The NetBSD Foundation.
  *  All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
 @@ -146,26 +146,27 @@ void	getmicrotime(struct timeval *);
 /* Other functions */
 int	abstimeout2timo(struct timespec *, int *);
 void	adjtime1(const struct timeval *, struct timeval *, struct proc *);
 int	clock_getres1(clockid_t, struct timespec *);
 int	clock_gettime1(clockid_t, struct timespec *);
 int	clock_settime1(struct proc *, clockid_t, const struct timespec *, bool);
 int	dogetitimer(struct proc *, int, struct itimerval *);
 int	dosetitimer(struct proc *, int, struct itimerval *);
 int	dotimer_gettime(int, struct proc *, struct itimerspec *);
 int	dotimer_settime(int, struct itimerspec *, struct itimerspec *, int,
 	    struct proc *);
 int	tshzto(const struct timespec *);
 int	tshztoup(const struct timespec *);
 int	tvhzto(const struct timeval *);
 void	inittimecounter(void);
 int	itimerfix(struct timeval *);
 int	itimespecfix(struct timespec *);
 int	ppsratecheck(struct timeval *, int *, int);
 int	ratecheck(struct timeval *, const struct timeval *);
 void	realtimerexpire(void *);
 int	settime(struct proc *p, struct timespec *);
 int	nanosleep1(struct lwp *l, struct timespec *, struct timespec *);
 int	settimeofday1(const struct timeval *, bool,
 	    const void *, struct lwp *, bool);
 int	timer_create1(timer_t *, clockid_t, struct sigevent *, copyin_t,
 	    struct lwp *);