[src/trunk]: src/sys/arch/xen/xen Reset the microtime state in inittodr(), so...

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

details:   https://anonhg.NetBSD.org/src/rev/6334a54f4c35
branches:  trunk
changeset: 581136:6334a54f4c35
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri May 27 22:02:25 2005 +0000

description:
Reset the microtime state in inittodr(), so that the next clock tick will
initialise the microtime state again. it was initialised at the first
clock tick before time of day was set. Should fix port-xen/29846.
Also, try harder to call microset() once a second; the clock interrupt handler
can be called more often than HZ in some case.

diffstat:

 sys/arch/xen/xen/clock.c |  45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diffs (87 lines):

diff -r 70b7f7d139b8 -r 6334a54f4c35 sys/arch/xen/xen/clock.c
--- a/sys/arch/xen/xen/clock.c  Fri May 27 21:40:09 2005 +0000
+++ b/sys/arch/xen/xen/clock.c  Fri May 27 22:02:25 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.11 2005/04/17 14:50:11 bouyer Exp $        */
+/*     $NetBSD: clock.c,v 1.12 2005/05/27 22:02:25 bouyer Exp $        */
 
 /*
  *
@@ -34,7 +34,7 @@
 #include "opt_xen.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2005/04/17 14:50:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2005/05/27 22:02:25 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -97,6 +97,7 @@
 inittodr(time_t base)
 {
        int s;
+       struct cpu_info *ci = curcpu();
 
        /*
         * if the file system time is more than a year older than the
@@ -116,6 +117,9 @@
 #ifdef DEBUG_CLOCK
        printf("readclock: %ld (%ld)\n", time.tv_sec, base);
 #endif
+       /* reset microset, so that the next call to microset() will init */
+       ci->ci_cc.cc_denom = 0;
+
        if (base != 0 && base < time.tv_sec - 5*SECYR)
                printf("WARNING: file system time much less than clock time\n");
        else if (base > time.tv_sec + 5*SECYR) {
@@ -243,35 +247,28 @@
 xen_timer_handler(void *arg, struct intrframe *regs)
 {
        int64_t delta;
-
-#if defined(I586_CPU) || defined(I686_CPU)
-       static int microset_iter; /* call cc_microset once/sec */
+       static int microset_iter = 0; /* call cc_microset once/sec */
        struct cpu_info *ci = curcpu();
        
-       /*
-        * If we have a cycle counter, do the microset thing.
-        */
-       if (ci->ci_feature_flags & CPUID_TSC) {
-               if (
-#if defined(MULTIPROCESSOR)
-                   CPU_IS_PRIMARY(ci) &&
-#endif
-                   (microset_iter--) == 0) {
-                       microset_iter = hz - 1;
-#if defined(MULTIPROCESSOR)
-                       x86_broadcast_ipi(X86_IPI_MICROSET);
-#endif
-                       cc_microset_time = time;
-                       cc_microset(ci);
-               }
-       }
-#endif
-
        get_time_values_from_xen();
 
        delta = (int64_t)(shadow_system_time + get_tsc_offset_ns() -
                          processed_system_time);
        while (delta >= NS_PER_TICK) {
+               if (ci->ci_feature_flags & CPUID_TSC) {
+                       if (
+#if defined(MULTIPROCESSOR)
+                          CPU_IS_PRIMARY(ci) &&
+#endif
+                           (microset_iter--) == 0) {
+                               microset_iter = hz - 1;
+#if defined(MULTIPROCESSOR)
+                               x86_broadcast_ipi(X86_IPI_MICROSET);
+#endif
+                               cc_microset_time = time;
+                               cc_microset(ci);
+                       }
+               }
                hardclock(regs);
                delta -= NS_PER_TICK;
                processed_system_time += NS_PER_TICK;