Module Name: src
Committed By: pooka
Date: Tue Apr 30 16:03:44 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: emul.c intr.c rump.c vm.c
Log Message:
Flip parameter order in the clock hypercalls to make them consistent
with everything else wrt in/out parameters.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.99 -r1.100 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.157 -r1.158 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpkern/intr.c
cvs rdiff -u -r1.265 -r1.266 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.143 -r1.144 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.47 src/lib/librumpuser/rumpuser.c:1.48
--- src/lib/librumpuser/rumpuser.c:1.47 Tue Apr 30 12:39:20 2013
+++ src/lib/librumpuser/rumpuser.c Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.47 2013/04/30 12:39:20 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.48 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.47 2013/04/30 12:39:20 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.48 2013/04/30 16:03:44 pooka Exp $");
#endif /* !lint */
#include <sys/ioctl.h>
@@ -395,7 +395,7 @@ rumpuser_iovwrite(int fd, const struct r
}
int
-rumpuser_clock_gettime(uint64_t *sec, uint64_t *nsec, enum rumpclock rclk)
+rumpuser_clock_gettime(enum rumpclock rclk, uint64_t *sec, uint64_t *nsec)
{
struct timespec ts;
clockid_t clk;
@@ -428,7 +428,7 @@ rumpuser_clock_gettime(uint64_t *sec, ui
}
int
-rumpuser_clock_sleep(uint64_t sec, uint64_t nsec, enum rumpclock clk)
+rumpuser_clock_sleep(enum rumpclock clk, uint64_t sec, uint64_t nsec)
{
struct timespec rqt, rmt;
int nlocks;
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.99 src/sys/rump/include/rump/rumpuser.h:1.100
--- src/sys/rump/include/rump/rumpuser.h:1.99 Tue Apr 30 13:29:28 2013
+++ src/sys/rump/include/rump/rumpuser.h Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.99 2013/04/30 13:29:28 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.100 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -114,8 +114,8 @@ int rumpuser_iovwrite(int, const struct
*/
enum rumpclock { RUMPUSER_CLOCK_RELWALL, RUMPUSER_CLOCK_ABSMONO };
-int rumpuser_clock_gettime(uint64_t *, uint64_t *, enum rumpclock);
-int rumpuser_clock_sleep(uint64_t, uint64_t, enum rumpclock);
+int rumpuser_clock_gettime(enum rumpclock, uint64_t *, uint64_t *);
+int rumpuser_clock_sleep(enum rumpclock, uint64_t, uint64_t);
/*
* host information retrieval
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.157 src/sys/rump/librump/rumpkern/emul.c:1.158
--- src/sys/rump/librump/rumpkern/emul.c:1.157 Tue Apr 30 00:03:53 2013
+++ src/sys/rump/librump/rumpkern/emul.c Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.157 2013/04/30 00:03:53 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.157 2013/04/30 00:03:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $");
#include <sys/param.h>
#include <sys/null.h>
@@ -152,7 +152,7 @@ kpause(const char *wmesg, bool intr, int
sec = timeo / hz;
nsec = (timeo % hz) * (1000000000 / hz);
- rv = rumpuser_clock_sleep(sec, nsec, RUMPUSER_CLOCK_RELWALL);
+ rv = rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, sec, nsec);
KASSERT(rv == 0);
if (mtx)
@@ -230,7 +230,7 @@ rump_delay(unsigned int us)
if (__predict_false(sec != 0))
printf("WARNING: over 1s delay\n");
- rumpuser_clock_sleep(sec, nsec, RUMPUSER_CLOCK_RELWALL);
+ rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, sec, nsec);
}
void (*delay_func)(unsigned int) = rump_delay;
Index: src/sys/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.38 src/sys/rump/librump/rumpkern/intr.c:1.39
--- src/sys/rump/librump/rumpkern/intr.c:1.38 Sun Apr 28 13:17:24 2013
+++ src/sys/rump/librump/rumpkern/intr.c Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.38 2013/04/28 13:17:24 pooka Exp $ */
+/* $NetBSD: intr.c,v 1.39 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2008-2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.38 2013/04/28 13:17:24 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.39 2013/04/30 16:03:44 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -104,7 +104,7 @@ doclock(void *noarg)
int error;
extern int hz;
- error = rumpuser_clock_gettime(&sec, &nsec, RUMPUSER_CLOCK_ABSMONO);
+ error = rumpuser_clock_gettime(RUMPUSER_CLOCK_ABSMONO, &sec, &nsec);
if (error)
panic("clock: cannot get monotonic time");
@@ -116,8 +116,8 @@ doclock(void *noarg)
for (;;) {
callout_hardclock();
- error = rumpuser_clock_sleep(curclock.tv_sec, curclock.tv_nsec,
- RUMPUSER_CLOCK_ABSMONO);
+ error = rumpuser_clock_sleep(RUMPUSER_CLOCK_ABSMONO,
+ curclock.tv_sec, curclock.tv_nsec);
KASSERT(!error);
timespecadd(&curclock, &thetick, &curclock);
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.265 src/sys/rump/librump/rumpkern/rump.c:1.266
--- src/sys/rump/librump/rumpkern/rump.c:1.265 Mon Apr 29 18:00:19 2013
+++ src/sys/rump/librump/rumpkern/rump.c Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.265 2013/04/29 18:00:19 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.266 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.265 2013/04/29 18:00:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.266 2013/04/30 16:03:44 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -273,7 +273,7 @@ rump_init(void)
rump_thread_init();
rump_cpus_bootstrap(&numcpu);
- rumpuser_clock_gettime(&sec, &nsec, RUMPUSER_CLOCK_RELWALL);
+ rumpuser_clock_gettime(RUMPUSER_CLOCK_RELWALL, &sec, &nsec);
boottime.tv_sec = sec;
boottime.tv_nsec = nsec;
@@ -569,7 +569,7 @@ cpu_reboot(int howto, char *bootstr)
printf("rump kernel halted\n");
rumpuser_sp_fini(finiarg);
for (;;) {
- rumpuser_clock_sleep(10, 0, RUMPUSER_CLOCK_RELWALL);
+ rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, 10, 0);
}
}
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.143 src/sys/rump/librump/rumpkern/vm.c:1.144
--- src/sys/rump/librump/rumpkern/vm.c:1.143 Tue Apr 30 00:29:19 2013
+++ src/sys/rump/librump/rumpkern/vm.c Tue Apr 30 16:03:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.143 2013/04/30 00:29:19 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.144 2013/04/30 16:03:44 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.143 2013/04/30 00:29:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.144 2013/04/30 16:03:44 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1077,7 +1077,7 @@ uvm_pageout(void *arg)
* the game soon.
*/
if (cleaned == 0 && lockrunning) {
- rumpuser_clock_sleep(0, 1, RUMPUSER_CLOCK_RELWALL);
+ rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, 0, 1);
lockrunning = false;
skip = 0;
