X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Ftimer.c;h=ecf6c5aacdfee97c6577c8b60912475ef99e4e77;hb=64f0952217e8b1a53461f5a98a070cb2da266171;hp=1706201f4ea8590b54a9bc58792667128bb23cf7;hpb=f2f8875638593bd5365cfd6a5ba7c9578e52322f;p=pintos-anon

diff --git a/src/devices/timer.c b/src/devices/timer.c
index 1706201..ecf6c5a 100644
--- a/src/devices/timer.c
+++ b/src/devices/timer.c
@@ -1,18 +1,31 @@
 #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"
   
+/* See [8254] for hardware details of the 8254 timer chip. */
+
 #if TIMER_FREQ < 19
 #error 8254 timer requires TIMER_FREQ >= 19
 #endif
+#if TIMER_FREQ > 1000
+#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 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
@@ -47,31 +60,47 @@ timer_elapsed (int64_t then)
   return timer_ticks () - then;
 }
 
-/* Suspends execution for approximately MS milliseconds. */
+/* Suspends execution for approximately TICKS timer ticks. */
 void
-timer_msleep (int64_t ms) 
+timer_sleep (int64_t ticks) 
 {
-  int64_t ticks = (int64_t) ms * TIMER_FREQ / 1000;
   int64_t start = timer_ticks ();
 
+  ASSERT (intr_get_level () == INTR_ON);
   while (timer_elapsed (start) < ticks) 
-    continue;
+    thread_yield ();
 }
 
-/* Suspends execution for approximately US microseconds.
-   Note: this is ridiculously inaccurate. */
-void
-timer_usleep (int64_t us) 
+/* 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) 
 {
-  timer_msleep (us / 1000 + 1);
+  return DIV_ROUND_UP (ns * TIMER_FREQ, 1000000000);
 }
 
-/* Suspends execution for approximately NS nanoseconds.
-   Note: this is ridiculously inaccurate. */
+/* Prints timer statistics. */
 void
-timer_nsleep (int64_t ns) 
+timer_print_stats (void) 
 {
-  timer_msleep (ns / 1000000 + 1);
+  printf ("Timer: %"PRId64" ticks\n", ticks);
 }
 
 /* Timer interrupt handler. */
@@ -79,5 +108,7 @@ static void
 timer_interrupt (struct intr_frame *args UNUSED)
 {
   ticks++;
-  intr_yield_on_return ();
+  thread_tick ();
+  if (ticks % TIME_SLICE == 0)
+    intr_yield_on_return ();
 }