[src/trunk]: src Flip parameter order in the clock hypercalls to make them co...

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

details:   https://anonhg.NetBSD.org/src/rev/e2ec4e9a27ff
branches:  trunk
changeset: 786524:e2ec4e9a27ff
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Apr 30 16:03:44 2013 +0000

description:
Flip parameter order in the clock hypercalls to make them consistent
with everything else wrt in/out parameters.

diffstat:

 lib/librumpuser/rumpuser.c       |   8 ++++----
 sys/rump/include/rump/rumpuser.h |   6 +++---
 sys/rump/librump/rumpkern/emul.c |   8 ++++----
 sys/rump/librump/rumpkern/intr.c |  10 +++++-----
 sys/rump/librump/rumpkern/rump.c |   8 ++++----
 sys/rump/librump/rumpkern/vm.c   |   6 +++---
 6 files changed, 23 insertions(+), 23 deletions(-)

diffs (193 lines):

diff -r c9a0d57bcaf9 -r e2ec4e9a27ff lib/librumpuser/rumpuser.c
--- a/lib/librumpuser/rumpuser.c        Tue Apr 30 15:59:34 2013 +0000
+++ b/lib/librumpuser/rumpuser.c        Tue Apr 30 16:03:44 2013 +0000
@@ -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 @@
 }
 
 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 @@
 }
 
 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;
diff -r c9a0d57bcaf9 -r e2ec4e9a27ff sys/rump/include/rump/rumpuser.h
--- a/sys/rump/include/rump/rumpuser.h  Tue Apr 30 15:59:34 2013 +0000
+++ b/sys/rump/include/rump/rumpuser.h  Tue Apr 30 16:03:44 2013 +0000
@@ -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 @@
  */
 
 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
diff -r c9a0d57bcaf9 -r e2ec4e9a27ff sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Tue Apr 30 15:59:34 2013 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Tue Apr 30 16:03:44 2013 +0000
@@ -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 @@
 
        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 @@
        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;
 
diff -r c9a0d57bcaf9 -r e2ec4e9a27ff sys/rump/librump/rumpkern/intr.c
--- a/sys/rump/librump/rumpkern/intr.c  Tue Apr 30 15:59:34 2013 +0000
+++ b/sys/rump/librump/rumpkern/intr.c  Tue Apr 30 16:03:44 2013 +0000
@@ -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 @@
        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 @@
        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);
 
diff -r c9a0d57bcaf9 -r e2ec4e9a27ff sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Tue Apr 30 15:59:34 2013 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Tue Apr 30 16:03:44 2013 +0000
@@ -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_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 @@
                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);
                }
        }
 
diff -r c9a0d57bcaf9 -r e2ec4e9a27ff sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Tue Apr 30 15:59:34 2013 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Tue Apr 30 16:03:44 2013 +0000
@@ -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 @@
                 * 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;