Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more time_t fixes

Browse Source
This commit is contained in:
jmcneill 2011-08-23 17:00:36 +00:00
parent 2b857b66d9
commit 52b361a049
4 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/usermode/dev/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.10 2011/08/23 16:09:27 jmcneill Exp $ */
/* $NetBSD: clock.c,v 1.11 2011/08/23 17:00:36 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.10 2011/08/23 16:09:27 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2011/08/23 17:00:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -83,7 +83,7 @@ static void
clock_attach(device_t parent, device_t self, void *opaque)
{
clock_softc_t *sc = device_private(self);
struct itimerval itimer;
struct thunk_itimerval itimer;
long tcres;
aprint_naive("\n");

9
sys/arch/usermode/include/thunk.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: thunk.h,v 1.12 2011/08/23 16:16:26 jmcneill Exp $ */
/* $NetBSD: thunk.h,v 1.13 2011/08/23 17:00:36 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
@ -43,7 +43,12 @@ struct thunk_timeval {
int32_t tv_usec;
};
int thunk_setitimer(int, const struct itimerval *, struct itimerval *);
struct thunk_itimerval {
struct thunk_timeval it_interval;
struct thunk_timeval it_value;
};
int thunk_setitimer(int, const struct thunk_itimerval *, struct thunk_itimerval *);
int thunk_gettimeofday(struct thunk_timeval *, void *);
unsigned int thunk_getcounter(void);
long thunk_clock_getres_monotonic(void);

6
sys/arch/usermode/usermode/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.13 2011/08/13 10:31:24 jmcneill Exp $ */
/* $NetBSD: machdep.c,v 1.14 2011/08/23 17:00:36 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2011/08/13 10:31:24 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2011/08/23 17:00:36 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -102,7 +102,7 @@ main(int argc, char *argv[])
void
usermode_reboot(void)
{
struct itimerval itimer;
struct thunk_itimerval itimer;
/* make sure the timer is turned off */
memset(&itimer, 0, sizeof(itimer));

53
sys/arch/usermode/usermode/thunk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: thunk.c,v 1.13 2011/08/23 16:16:26 jmcneill Exp $ */
/* $NetBSD: thunk.c,v 1.14 2011/08/23 17:00:36 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: thunk.c,v 1.13 2011/08/23 16:16:26 jmcneill Exp $");
__RCSID("$NetBSD: thunk.c,v 1.14 2011/08/23 17:00:36 jmcneill Exp $");
#include <sys/types.h>
#include <sys/ansi.h>
@ -46,11 +46,49 @@ __RCSID("$NetBSD: thunk.c,v 1.13 2011/08/23 16:16:26 jmcneill Exp $");
#include "../include/thunk.h"
int
thunk_setitimer(int which, const struct itimerval *value,
struct itimerval *ovalue)
static void
thunk_to_timeval(const struct thunk_timeval *ttv, struct timeval *tv)
{
return setitimer(which, value, ovalue);
tv->tv_sec = ttv->tv_sec;
tv->tv_usec = ttv->tv_usec;
}
static void
thunk_from_timeval(const struct timeval *tv, struct thunk_timeval *ttv)
{
ttv->tv_sec = tv->tv_sec;
ttv->tv_usec = tv->tv_usec;
}
static void
thunk_to_itimerval(const struct thunk_itimerval *tit, struct itimerval *it)
{
thunk_to_timeval(&tit->it_interval, &it->it_interval);
thunk_to_timeval(&tit->it_value, &it->it_value);
}
static void
thunk_from_itimerval(const struct itimerval *it, struct thunk_itimerval *tit)
{
thunk_from_timeval(&it->it_interval, &tit->it_interval);
thunk_from_timeval(&it->it_value, &tit->it_value);
}
int
thunk_setitimer(int which, const struct thunk_itimerval *value,
struct thunk_itimerval *ovalue)
{
struct itimerval it, oit;
int error;
thunk_to_itimerval(value, &it);
error = setitimer(which, &it, &oit);
if (error)
return error;
if (ovalue)
thunk_from_itimerval(&oit, ovalue);
return 0;
}
int
@ -63,8 +101,7 @@ thunk_gettimeofday(struct thunk_timeval *tp, void *tzp)
if (error)
return error;
tp->tv_sec = tv.tv_sec;
tp->tv_usec = tv.tv_usec;
thunk_from_timeval(&tv, tp);
return 0;
}