Applied patch set 6 by Ben, derived from Anthony's megapatch, and minor

[pintos-anon] / src / devices / timer.c

diff --git a/src/devices/timer.c b/src/devices/timer.c
index 3724abf944ab4fbf7d53936cdbe822a2a7b9a5a5..a83a588d6884dc271bca00909148c0348a0b986a 100644 (file)
--- a/src/devices/timer.c
+++ b/src/devices/timer.c
@@ -3,8 +3,9 @@
 #include <inttypes.h>
 #include <round.h>
 #include <stdio.h>
+#include "devices/pit.h"
 #include "threads/interrupt.h"
-#include "threads/io.h"
+#include "threads/synch.h"
 #include "threads/thread.h"
   
 /* See [8254] for hardware details of the 8254 timer chip. */
@@ -16,12 +17,8 @@
 #error TIMER_FREQ <= 1000 recommended
 #endif
 
-/* Number of timer ticks that a process gets before being
-   preempted. */
-#define TIME_SLICE 1
-
 /* Number of timer ticks since OS booted. */
-static volatile int64_t ticks;
+static int64_t ticks;
 
 /* Number of loops per timer tick.
    Initialized by timer_calibrate(). */
@@ -32,21 +29,13 @@ static bool too_many_loops (unsigned loops);
 static void busy_wait (int64_t loops);
 static void real_time_sleep (int64_t num, int32_t denom);
 
-/* Sets up the 8254 Programmable Interval Timer (PIT) to
-   interrupt PIT_FREQ times per second, and registers the
-   corresponding interrupt. */
+/* Sets up the timer to interrupt TIMER_FREQ times per second,
+   and registers the corresponding interrupt. */
 void
 timer_init (void) 
 {
-  /* 8254 input frequency divided by TIMER_FREQ, rounded to
-     nearest. */
-  uint16_t count = (1193180 + TIMER_FREQ / 2) / TIMER_FREQ;
-
-  outb (0x43, 0x34);    /* CW: counter 0, LSB then MSB, mode 2, binary. */
-  outb (0x40, count & 0xff);
-  outb (0x40, count >> 8);
-
-  intr_register (0x20, 0, INTR_OFF, timer_interrupt, "8254 Timer");
+  pit_configure_channel (0, 2, TIMER_FREQ);
+  intr_register_ext (0x20, timer_interrupt, "8254 Timer");
 }
 
 /* Calibrates loops_per_tick, used to implement brief delays. */
@@ -61,8 +50,11 @@ timer_calibrate (void)
   /* Approximate loops_per_tick as the largest power-of-two
      still less than one timer tick. */
   loops_per_tick = 1u << 10;
-  while (!too_many_loops (loops_per_tick << 1))
-    loops_per_tick <<= 1;
+  while (!too_many_loops (loops_per_tick << 1)) 
+    {
+      loops_per_tick <<= 1;
+      ASSERT (loops_per_tick != 0);
+    }
 
   /* Refine the next 8 bits of loops_per_tick. */
   high_bit = loops_per_tick;
@@ -80,6 +72,7 @@ timer_ticks (void)
   enum intr_level old_level = intr_disable ();
   int64_t t = ticks;
   intr_set_level (old_level);
+  barrier ();
   return t;
 }
 
@@ -127,7 +120,7 @@ timer_nsleep (int64_t ns)
 void
 timer_print_stats (void) 
 {
-  printf ("Timer: %"PRId64" ticks\n", ticks);
+  printf ("Timer: %"PRId64" ticks\n", timer_ticks ());
 }
 \f
 /* Timer interrupt handler. */
@@ -136,8 +129,6 @@ timer_interrupt (struct intr_frame *args UNUSED)
 {
   ticks++;
   thread_tick ();
-  if (ticks % TIME_SLICE == 0)
-    intr_yield_on_return ();
 }
 
 /* Returns true if LOOPS iterations waits for more than one timer
@@ -145,18 +136,17 @@ timer_interrupt (struct intr_frame *args UNUSED)
 static bool
 too_many_loops (unsigned loops) 
 {
-  int64_t start;
-
   /* Wait for a timer tick. */
-  start = ticks;
+  int64_t start = ticks;
   while (ticks == start)
-    continue;
+    barrier ();
 
   /* Run LOOPS loops. */
   start = ticks;
   busy_wait (loops);
 
   /* If the tick count changed, we iterated too long. */
+  barrier ();
   return start != ticks;
 }
 
@@ -171,7 +161,7 @@ static void NO_INLINE
 busy_wait (int64_t loops) 
 {
   while (loops-- > 0)
-    continue;
+    barrier ();
 }
 
 /* Sleep for approximately NUM/DENOM seconds. */