Module Name: src
Committed By: rmind
Date: Mon Apr 26 16:26:11 UTC 2010
Modified Files:
src/sys/kern: subr_time.c
Log Message:
Revert rev1.6, it shall return ETIMEDOUT for pthread calls.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/sys/kern/subr_time.c:1.7
--- src/sys/kern/subr_time.c:1.6 Fri Apr 23 19:29:23 2010
+++ src/sys/kern/subr_time.c Mon Apr 26 16:26:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.6 2010/04/23 19:29:23 rmind Exp $ */
+/* $NetBSD: subr_time.c,v 1.7 2010/04/26 16:26:11 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.6 2010/04/23 19:29:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.7 2010/04/26 16:26:11 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -208,13 +208,13 @@
getnanotime(&tsd);
timespecsub(ts, &tsd, &tsd);
+ if (tsd.tv_sec < 0 || (tsd.tv_sec == 0 && tsd.tv_nsec <= 0)) {
+ return ETIMEDOUT;
+ }
error = itimespecfix(&tsd);
if (error) {
return error;
}
- if (tsd.tv_sec < 0 || (tsd.tv_sec == 0 && tsd.tv_nsec <= 0)) {
- return ETIMEDOUT;
- }
*timo = tstohz(&tsd);
KASSERT(*timo != 0);
