 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser.h,v 1.31 2009/10/24 11:36:59 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.32 2009/11/11 16:46:50 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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
 @@ -132,27 +132,27 @@ int  rumpuser_rw_tryenter(struct rumpuse
 void rumpuser_rw_exit(struct rumpuser_rw *);
 void rumpuser_rw_destroy(struct rumpuser_rw *);
 int  rumpuser_rw_held(struct rumpuser_rw *);
 int  rumpuser_rw_rdheld(struct rumpuser_rw *);
 int  rumpuser_rw_wrheld(struct rumpuser_rw *);
 struct rumpuser_cv;
 void rumpuser_cv_init(struct rumpuser_cv **);
 void rumpuser_cv_destroy(struct rumpuser_cv *);
 void rumpuser_cv_wait(struct rumpuser_cv *, struct rumpuser_mtx *);
 void rumpuser_cv_wait_nowrap(struct rumpuser_cv *, struct rumpuser_mtx *);
 int  rumpuser_cv_timedwait(struct rumpuser_cv *, struct rumpuser_mtx *,
-			   struct timespec *);
+			   int64_t, int64_t);
 void rumpuser_cv_signal(struct rumpuser_cv *);
 void rumpuser_cv_broadcast(struct rumpuser_cv *);
 int  rumpuser_cv_has_waiters(struct rumpuser_cv *);
 struct lwp;
 void rumpuser_set_curlwp(struct lwp *);
 struct lwp *rumpuser_get_curlwp(void);
 /* "aio" stuff for being able to fire of a B_ASYNC I/O and continue */
 struct rumpuser_aio {
 	int	rua_fd;
 	uint8_t	*rua_data;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.20 2009/11/09 19:16:18 pooka Exp $	*/
+/*	$NetBSD: intr.c,v 1.21 2009/11/11 16:46:50 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  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.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.20 2009/11/09 19:16:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.21 2009/11/11 16:46:50 pooka Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/intr.h>
 #include <rump/rumpuser.h>
 #include "rump_private.h"
 /*
  * Interrupt simulator.  It executes hardclock() and softintrs.
 @@ -114,27 +114,27 @@ doclock(void *noarg)
 	rumpuser_mutex_enter(clockmtx);
 	rumpuser_cv_signal(clockcv);
 	for (;;) {
 		callout_hardclock();
 		if (++ticks == hz) {
 			time_uptime++;
 			ticks = 0;
+		}
 		/* wait until the next tick. XXX: what if the clock changes? */
 		while (rumpuser_cv_timedwait(clockcv, clockmtx,
-		    &curtime) != EWOULDBLOCK)
+		    curtime.tv_sec, curtime.tv_nsec) == 0)
 			continue;
 		clkgen++;
 		timespecadd(&clockup, &tick, &clockup);
 		clkgen++;
 		timespecadd(&clockup, &clockbase, &curtime);
+	}
+}
 /*
  * Soft interrupt execution thread.  Note that we run without a CPU
  * context until we start processing the interrupt.  This is to avoid
  * lock recursion.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locks.c,v 1.33 2009/11/04 13:32:39 pooka Exp $	*/
+/*	$NetBSD: locks.c,v 1.34 2009/11/11 16:46:50 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.33 2009/11/04 13:32:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.34 2009/11/11 16:46:50 pooka Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <rump/rumpuser.h>
 #include "rump_private.h"
 /*
  * We map locks to pthread routines.  The difference between kernel
  * and rumpuser routines is that while the kernel uses static
 @@ -226,27 +226,31 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *m
+{
 	struct timespec ts, tick;
 	extern int hz;
 	nanotime(&ts);
 	tick.tv_sec = ticks / hz;
 	tick.tv_nsec = (ticks % hz) * (1000000000/hz);
 	timespecadd(&ts, &tick, &ts);
 	if (ticks == 0) {
 		cv_wait(cv, mtx);
 		return 0;
 	} else {
-		return rumpuser_cv_timedwait(RUMPCV(cv), RUMPMTX(mtx), &ts);
+		if (rumpuser_cv_timedwait(RUMPCV(cv), RUMPMTX(mtx),
 		    ts.tv_sec, ts.tv_nsec))
 			return EWOULDBLOCK;
 		else
 			return 0;
+	}
+}
 int
 cv_timedwait_sig(kcondvar_t *cv, kmutex_t *mtx, int ticks)
+{
 	return cv_timedwait(cv, mtx, ticks);
+}
 void
 cv_signal(kcondvar_t *cv)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser_pth.c,v 1.37 2009/11/09 18:00:26 pooka Exp $	*/
+/*	$NetBSD: rumpuser_pth.c,v 1.38 2009/11/11 16:46:50 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -20,27 +20,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_pth.c,v 1.37 2009/11/09 18:00:26 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_pth.c,v 1.38 2009/11/11 16:46:50 pooka Exp $");
 #endif /* !lint */
 #ifdef __linux__
 #define _XOPEN_SOURCE 500
 #define _BSD_SOURCE
 #define _FILE_OFFSET_BITS 64
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 @@ -463,41 +463,43 @@ void
 rumpuser_cv_wait_nowrap(struct rumpuser_cv *cv, struct rumpuser_mtx *mtx)
+{
 	cv->nwaiters++;
 	assert(mtx->recursion == 1);
 	mtxexit(mtx);
 	NOFAIL_ERRNO(pthread_cond_wait(&cv->pthcv, &mtx->pthmtx));
 	mtxenter(mtx);
 	cv->nwaiters--;
+}
 int
 rumpuser_cv_timedwait(struct rumpuser_cv *cv, struct rumpuser_mtx *mtx,
-	struct timespec *ts)
+	int64_t sec, int64_t nsec)
+{
 	struct timespec ts;
 	int rv;
 	/* LINTED */
 	ts.tv_sec = sec; ts.tv_nsec = nsec;
 	cv->nwaiters++;
 	mtxexit(mtx);
-	KLOCK_WRAP(rv = pthread_cond_timedwait(&cv->pthcv, &mtx->pthmtx, ts));
+	KLOCK_WRAP(rv = pthread_cond_timedwait(&cv->pthcv, &mtx->pthmtx, &ts));
 	mtxenter(mtx);
 	cv->nwaiters--;
 	if (rv != 0 && rv != ETIMEDOUT)
 		abort();
-	if (rv == ETIMEDOUT)
+	return rv == ETIMEDOUT;
 		rv = EWOULDBLOCK;
 	return rv;
+}
 void
 rumpuser_cv_signal(struct rumpuser_cv *cv)
+{
 	NOFAIL_ERRNO(pthread_cond_signal(&cv->pthcv));
+}
 void
 rumpuser_cv_broadcast(struct rumpuser_cv *cv)
+{