Module Name: src
Committed By: riastradh
Date: Tue Apr 14 12:25:41 UTC 2015
Modified Files:
src/sys/dev: rndpseudo.c
src/sys/kern: kern_rndq.c
Log Message:
Use binuptime, not microtime/nanotime as substitute cycle counter.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/kern_rndq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.28 src/sys/dev/rndpseudo.c:1.29
--- src/sys/dev/rndpseudo.c:1.28 Tue Apr 14 12:21:12 2015
+++ src/sys/dev/rndpseudo.c Tue Apr 14 12:25:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.28 2015/04/14 12:21:12 riastradh Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.29 2015/04/14 12:25:41 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.28 2015/04/14 12:21:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.29 2015/04/14 12:25:41 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -156,20 +156,26 @@ EVCNT_ATTACH_STATIC(rndpseudo_soft);
EVCNT_ATTACH_STATIC(rndpseudo_hard);
/*
- * Generate a 32-bit counter. This should be more machine dependent,
- * using cycle counters and the like when possible.
+ * Generate a 32-bit counter.
*/
-static inline u_int32_t
+static inline uint32_t
rndpseudo_counter(void)
{
- struct timeval tv;
+ struct bintime bt;
+ uint32_t ret;
#if defined(__HAVE_CPU_COUNTER)
if (cpu_hascounter())
return (cpu_counter32());
#endif
- microtime(&tv);
- return (tv.tv_sec * 1000000 + tv.tv_usec);
+
+ binuptime(&bt);
+ ret = bt.sec;
+ ret |= bt.sec >> 32;
+ ret |= bt.frac;
+ ret |= bt.frac >> 32;
+
+ return ret;
}
/*
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.48 src/sys/kern/kern_rndq.c:1.49
--- src/sys/kern/kern_rndq.c:1.48 Tue Apr 14 11:59:40 2015
+++ src/sys/kern/kern_rndq.c Tue Apr 14 12:25:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.48 2015/04/14 11:59:40 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.49 2015/04/14 12:25:41 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.48 2015/04/14 11:59:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.49 2015/04/14 12:25:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -223,22 +223,24 @@ rnd_init_softint(void) {
static inline uint32_t
rnd_counter(void)
{
- struct timespec ts;
+ struct bintime bt;
uint32_t ret;
#if defined(__HAVE_CPU_COUNTER)
if (cpu_hascounter())
return cpu_counter32();
#endif
- if (rnd_ready) {
- nanouptime(&ts);
- ret = ts.tv_sec;
- ret *= (uint32_t)1000000000;
- ret += ts.tv_nsec;
- return ret;
- }
- /* when called from rnd_init, its too early to call nanotime safely */
- return (0);
+ if (!rnd_ready)
+ /* Too early to call nanotime. */
+ return 0;
+
+ binuptime(&bt);
+ ret = bt.sec;
+ ret |= bt.sec >> 32;
+ ret |= bt.frac;
+ ret |= bt.frac >> 32;
+
+ return ret;
}
/*
