[src/trunk]: src/external/cddl/osnet/lib/libzpool Fix userspace cv_timedwait ...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b6d2fc86925
branches:  trunk
changeset: 754764:1b6d2fc86925
user:      haad <haad%NetBSD.org@localhost>
date:      Tue May 11 22:18:10 2010 +0000

description:
Fix userspace cv_timedwait implementation to work on NetBSD.

diffstat:

 external/cddl/osnet/lib/libzpool/kernel2.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r f8dfdc1c3434 -r 1b6d2fc86925 external/cddl/osnet/lib/libzpool/kernel2.c
--- a/external/cddl/osnet/lib/libzpool/kernel2.c        Tue May 11 21:50:35 2010 +0000
+++ b/external/cddl/osnet/lib/libzpool/kernel2.c        Tue May 11 22:18:10 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernel2.c,v 1.1 2009/08/07 20:57:56 haad Exp $ */
+/*     $NetBSD: kernel2.c,v 1.2 2010/05/11 22:18:10 haad Exp $ */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: kernel2.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
+__RCSID("$NetBSD: kernel2.c,v 1.2 2010/05/11 22:18:10 haad Exp $");
 
 #include <sys/zfs_context.h>
 
@@ -239,6 +239,7 @@
 clock_t
 cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime)
 {
+       struct timespec nowts;
        struct timespec ts;
        uint64_t when;
        int error;
@@ -247,10 +248,14 @@
                cv_init(cv, NULL, 0, NULL);
        }
 
+       clock_gettime(CLOCK_REALTIME, &nowts);
+       
        /* convert back from 119hz to nanoseconds. */
-       when = abstime << 23;
+       when = (uint64_t)abstime << 23;
        ts.tv_sec = (long)(abstime / 1000000000);
        ts.tv_nsec = (long)(abstime % 1000000000);
+
+       timespecadd(&ts, &nowts, &ts);
        
        do {
                error = pthread_cond_timedwait(GET(cv), GET(mp), &ts);