X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Ftimer.c;h=8f47c810ffc8af5a1c6804933fad710929450318;hb=34a1a2cf11500505e74ae5796e88de0d8de00958;hp=67fe567b48366bae5ba4c965f2a3a6e2ef773611;hpb=750d21936d284127e265d050ccbce76fca1ece1a;p=pintos-anon

diff --git a/src/devices/timer.c b/src/devices/timer.c
index 67fe567..8f47c81 100644
--- a/src/devices/timer.c
+++ b/src/devices/timer.c
@@ -1,18 +1,29 @@
-#include "timer.h"
-#include "debug.h"
-#include "interrupt.h"
-#include "io.h"
+#include "devices/timer.h"
+#include <debug.h>
+#include <inttypes.h>
+#include <round.h>
+#include <stdio.h>
+#include "threads/interrupt.h"
+#include "threads/io.h"
+#include "threads/thread.h"
   
-static volatile uint64_t ticks;
+#if TIMER_FREQ < 19
+#error 8254 timer requires TIMER_FREQ >= 19
+#endif
+#if TIMER_FREQ > 1000
+#error TIMER_FREQ <= 1000 recommended
+#endif
 
-static void
-irq20_timer (struct intr_args *args UNUSED)
-{
-  ticks++;
-  intr_yield_on_return ();
-}
+/* 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 intr_handler_func timer_interrupt;
 
-/* Sets up the 8254 Programmable Interrupt Timer (PIT) to
+/* Sets up the 8254 Programmable Interval Timer (PIT) to
    interrupt PIT_FREQ times per second, and registers the
    corresponding interrupt. */
 void
@@ -26,28 +37,76 @@ timer_init (void)
   outb (0x40, count & 0xff);
   outb (0x40, count >> 8);
 
-  intr_register (0x20, 0, IF_OFF, irq20_timer);
+  intr_register (0x20, 0, INTR_OFF, timer_interrupt, "8254 Timer");
 }
 
-uint64_t
+/* Returns the number of timer ticks since the OS booted. */
+int64_t
 timer_ticks (void) 
 {
-  enum if_level old_level = intr_disable ();
-  uint64_t t = ticks;
+  enum intr_level old_level = intr_disable ();
+  int64_t t = ticks;
   intr_set_level (old_level);
   return t;
 }
 
-uint64_t
-timer_elapsed (uint64_t then) 
+/* Returns the number of timer ticks elapsed since THEN, which
+   should be a value once returned by timer_ticks(). */
+int64_t
+timer_elapsed (int64_t then) 
+{
+  return timer_ticks () - then;
+}
+
+/* Suspends execution for approximately TICKS timer ticks. */
+void
+timer_sleep (int64_t ticks) 
+{
+  int64_t start = timer_ticks ();
+
+  while (timer_elapsed (start) < ticks) 
+    if (intr_get_level () == INTR_ON)
+      thread_yield ();
+}
+
+/* Returns MS milliseconds in timer ticks, rounding up. */
+int64_t
+timer_ms2ticks (int64_t ms) 
+{
+  /*       MS / 1000 s          
+     ------------------------ = MS * TIMER_FREQ / 1000 ticks. 
+     (1 / TIMER_FREQ) ticks/s
+  */
+  return DIV_ROUND_UP (ms * TIMER_FREQ, 1000);
+}
+
+/* Returns US microseconds in timer ticks, rounding up. */
+int64_t
+timer_us2ticks (int64_t us) 
+{
+  return DIV_ROUND_UP (us * TIMER_FREQ, 1000000);
+}
+
+/* Returns NS nanoseconds in timer ticks, rounding up. */
+int64_t
+timer_ns2ticks (int64_t ns) 
 {
-  uint64_t now = timer_ticks ();
-  return now > then ? now - then : ((uint64_t) -1 - then) + now + 1;
+  return DIV_ROUND_UP (ns * TIMER_FREQ, 1000000000);
 }
 
-/* Suspends execution for at least DURATION ticks. */
+/* Prints timer statistics. */
 void
-timer_wait_until (uint64_t duration) 
+timer_print_stats (void) 
+{
+  printf ("Timer: %"PRId64" ticks.\n", ticks);
+}
+
+/* Timer interrupt handler. */
+static void
+timer_interrupt (struct intr_frame *args UNUSED)
 {
-  /* FIXME */
+  ticks++;
+  thread_tick ();
+  if (ticks % TIME_SLICE == 0)
+    intr_yield_on_return ();
 }