Module Name: src
Committed By: justin
Date: Sun Feb 15 00:54:32 UTC 2015
Modified Files:
src/lib/librumpuser: rumpfiber.c rumpfiber.h rumpfiber_sp.c
Log Message:
Minor fixes to types and includes
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/librumpuser/rumpfiber.c
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/rumpfiber.h \
src/lib/librumpuser/rumpfiber_sp.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/rumpfiber.c
diff -u src/lib/librumpuser/rumpfiber.c:1.11 src/lib/librumpuser/rumpfiber.c:1.12
--- src/lib/librumpuser/rumpfiber.c:1.11 Fri Feb 13 22:00:53 2015
+++ src/lib/librumpuser/rumpfiber.c Sun Feb 15 00:54:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfiber.c,v 1.11 2015/02/13 22:00:53 justin Exp $ */
+/* $NetBSD: rumpfiber.c,v 1.12 2015/02/15 00:54:32 justin Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -68,10 +68,9 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpfiber.c,v 1.11 2015/02/13 22:00:53 justin Exp $");
+__RCSID("$NetBSD: rumpfiber.c,v 1.12 2015/02/15 00:54:32 justin Exp $");
#endif /* !lint */
-#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/time.h>
@@ -486,7 +485,7 @@ int
rumpuser_clock_sleep(int enum_rumpclock, int64_t sec, long nsec)
{
enum rumpclock rclk = enum_rumpclock;
- uint32_t msec;
+ uint64_t msec;
int nlocks;
rumpkern_unsched(&nlocks, NULL);
Index: src/lib/librumpuser/rumpfiber.h
diff -u src/lib/librumpuser/rumpfiber.h:1.3 src/lib/librumpuser/rumpfiber.h:1.4
--- src/lib/librumpuser/rumpfiber.h:1.3 Mon Dec 29 21:50:09 2014
+++ src/lib/librumpuser/rumpfiber.h Sun Feb 15 00:54:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfiber.h,v 1.3 2014/12/29 21:50:09 justin Exp $ */
+/* $NetBSD: rumpfiber.h,v 1.4 2015/02/15 00:54:32 justin Exp $ */
/*
* Copyright (c) 2014 Justin Cormack. All Rights Reserved.
@@ -40,7 +40,7 @@ struct thread {
int64_t wakeup_time;
TAILQ_ENTRY(thread) thread_list;
ucontext_t ctx;
- uint32_t flags;
+ int flags;
int threrrno;
};
Index: src/lib/librumpuser/rumpfiber_sp.c
diff -u src/lib/librumpuser/rumpfiber_sp.c:1.3 src/lib/librumpuser/rumpfiber_sp.c:1.4
--- src/lib/librumpuser/rumpfiber_sp.c:1.3 Mon Dec 29 21:50:09 2014
+++ src/lib/librumpuser/rumpfiber_sp.c Sun Feb 15 00:54:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfiber_sp.c,v 1.3 2014/12/29 21:50:09 justin Exp $ */
+/* $NetBSD: rumpfiber_sp.c,v 1.4 2015/02/15 00:54:32 justin Exp $ */
/*
* Copyright (c) 2014 Justin Cormack. All Rights Reserved.
@@ -30,9 +30,10 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpfiber_sp.c,v 1.3 2014/12/29 21:50:09 justin Exp $");
+__RCSID("$NetBSD: rumpfiber_sp.c,v 1.4 2015/02/15 00:54:32 justin Exp $");
#endif /* !lint */
+#include <stdint.h>
#include <stdlib.h>
#include <rump/rumpuser.h>
