Call thread_yield() in timer_sleep() if interrupts are on.

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

diff --git a/src/devices/timer.c b/src/devices/timer.c
index d23bed3efb043618feb465a4259c85c8f77e5868..200d58f8251e0b660bd3a4fa49367b337a882857 100644 (file)
--- a/src/devices/timer.c
+++ b/src/devices/timer.c
@@ -1,11 +1,20 @@
-#include "timer.h"
-#include "debug.h"
-#include "interrupt.h"
-#include "io.h"
+#include "devices/timer.h"
+#include <debug.h>
+#include <round.h>
+#include "threads/interrupt.h"
+#include "threads/io.h"
+#include "threads/thread.h"
   
 #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;
@@ -47,31 +56,40 @@ 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 ();
 
   while (timer_elapsed (start) < ticks) 
-    continue;
+    if (intr_get_level () == INTR_ON)
+      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) 
 {
-  timer_msleep (us / 1000 + 1);
+  /*       MS / 1000 s          
+     ------------------------ = MS * TIMER_FREQ / 1000 ticks. 
+     (1 / TIMER_FREQ) ticks/s
+  */
+  return DIV_ROUND_UP (ms * TIMER_FREQ, 1000);
 }
 
-/* Suspends execution for approximately NS nanoseconds.
-   Note: this is ridiculously inaccurate. */
-void
-timer_nsleep (int64_t ns) 
+/* 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 (ns / 1000000 + 1);
+  return DIV_ROUND_UP (ns * TIMER_FREQ, 1000000000);
 }
 \f
 /* Timer interrupt handler. */
@@ -79,5 +97,6 @@ static void
 timer_interrupt (struct intr_frame *args UNUSED)
 {
   ticks++;
-  intr_yield_on_return ();
+  if (ticks % TIME_SLICE == 0)
+    intr_yield_on_return ();
 }