Module Name: src
Committed By: martin
Date: Mon Apr 1 12:31:34 UTC 2013
Modified Files:
src/sys/kern: subr_time.c
Log Message:
ts2timo: return ETIMEDOUT instead of failing an assertion when the
calculated difference to the target time is zero.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/subr_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/subr_time.c
diff -u src/sys/kern/subr_time.c:1.12 src/sys/kern/subr_time.c:1.13
--- src/sys/kern/subr_time.c:1.12 Sun Mar 31 16:46:29 2013
+++ src/sys/kern/subr_time.c Mon Apr 1 12:31:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.12 2013/03/31 16:46:29 christos Exp $ */
+/* $NetBSD: subr_time.c,v 1.13 2013/04/01 12:31:34 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.12 2013/03/31 16:46:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.13 2013/04/01 12:31:34 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -241,7 +241,7 @@ int
ts2timo(clockid_t clock_id, int flags, struct timespec *ts,
int *timo, struct timespec *start)
{
- int error;
+ int error, res;
struct timespec tsd;
flags &= TIMER_ABSTIME;
@@ -259,8 +259,12 @@ ts2timo(clockid_t clock_id, int flags, s
if ((error = itimespecfix(ts)) != 0)
return error;
- *timo = tstohz(ts);
- KASSERT(*timo > 0);
+ res = tstohz(ts);
+ if (res == 0)
+ return ETIMEDOUT;
+
+ KASSERT(res > 0);
+ *timo = res;
return 0;
}
