Module Name: src
Committed By: pooka
Date: Thu May 2 21:45:29 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: intr.c rump.c
Log Message:
Ok, maybe using int64 for nanoseconds in the (sec,nsec) tuple was
a bit too future-proof. I think long is enough there (let's just
hope nobody redefines "nano"). Also, make seconds signed just in
case someone wants their clock to be in 1901.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.102 -r1.103 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/librump/rumpkern/intr.c
cvs rdiff -u -r1.267 -r1.268 src/sys/rump/librump/rumpkern/rump.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.49 src/lib/librumpuser/rumpuser.c:1.50
--- src/lib/librumpuser/rumpuser.c:1.49 Wed May 1 17:17:54 2013
+++ src/lib/librumpuser/rumpuser.c Thu May 2 21:45:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.49 2013/05/01 17:17:54 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.50 2013/05/02 21:45:29 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.49 2013/05/01 17:17:54 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.50 2013/05/02 21:45:29 pooka Exp $");
#endif /* !lint */
#include <sys/ioctl.h>
@@ -395,7 +395,7 @@ rumpuser_iovwrite(int fd, const struct r
}
int
-rumpuser_clock_gettime(enum rumpclock rclk, uint64_t *sec, uint64_t *nsec)
+rumpuser_clock_gettime(enum rumpclock rclk, int64_t *sec, long *nsec)
{
struct timespec ts;
clockid_t clk;
@@ -428,7 +428,7 @@ rumpuser_clock_gettime(enum rumpclock rc
}
int
-rumpuser_clock_sleep(enum rumpclock clk, uint64_t sec, uint64_t nsec)
+rumpuser_clock_sleep(enum rumpclock clk, int64_t sec, long 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.102 src/sys/rump/include/rump/rumpuser.h:1.103
--- src/sys/rump/include/rump/rumpuser.h:1.102 Thu May 2 21:35:19 2013
+++ src/sys/rump/include/rump/rumpuser.h Thu May 2 21:45:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.102 2013/05/02 21:35:19 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.103 2013/05/02 21:45:28 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(enum rumpclock, uint64_t *, uint64_t *);
-int rumpuser_clock_sleep(enum rumpclock, uint64_t, uint64_t);
+int rumpuser_clock_gettime(enum rumpclock, int64_t *, long *);
+int rumpuser_clock_sleep(enum rumpclock, int64_t, long);
/*
* host information retrieval
Index: src/sys/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.39 src/sys/rump/librump/rumpkern/intr.c:1.40
--- src/sys/rump/librump/rumpkern/intr.c:1.39 Tue Apr 30 16:03:44 2013
+++ src/sys/rump/librump/rumpkern/intr.c Thu May 2 21:45:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.39 2013/04/30 16:03:44 pooka Exp $ */
+/* $NetBSD: intr.c,v 1.40 2013/05/02 21:45:28 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.39 2013/04/30 16:03:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.40 2013/05/02 21:45:28 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -100,7 +100,8 @@ static void
doclock(void *noarg)
{
struct timespec thetick, curclock;
- uint64_t sec, nsec;
+ int64_t sec;
+ long nsec;
int error;
extern int hz;
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.267 src/sys/rump/librump/rumpkern/rump.c:1.268
--- src/sys/rump/librump/rumpkern/rump.c:1.267 Thu May 2 19:15:01 2013
+++ src/sys/rump/librump/rumpkern/rump.c Thu May 2 21:45:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.267 2013/05/02 19:15:01 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.268 2013/05/02 21:45:28 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.267 2013/05/02 19:15:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.268 2013/05/02 21:45:28 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -235,7 +235,8 @@ rump_init(void)
{
char buf[256];
struct timespec ts;
- uint64_t sec, nsec;
+ int64_t sec;
+ long nsec;
struct lwp *l;
int i, numcpu;
