Use runtime options instead of conditional compilation for MLFQS,

[pintos-anon] / src / threads / test.c

diff --git a/src/threads/test.c b/src/threads/test.c
index 2aeb91001aaa5351d396874a6ac7051d3e0da9c0..694ea0b98c1b8706d3afe8cff9864221bf9b2231 100644 (file)
--- a/src/threads/test.c
+++ b/src/threads/test.c
@@ -11,15 +11,14 @@
 #include "threads/thread.h"
 #include "devices/timer.h"
 
-#ifdef MLFQS
-#error This test not applicable with MLFQS enabled.
-#endif
-
 static void test_sleep (int thread_cnt, int iterations);
 
 void
 test (void) 
 {
+  /* This test does not work with the MLFQS. */
+  ASSERT (!enable_mlfqs);
+
   /* Easy test: 5 threads sleep once each. */
   test_sleep (5, 1);
 
@@ -134,6 +133,7 @@ test_sleep (int thread_cnt, int iterations)
   
   printf ("Test complete.\n");
 
+  lock_release (&test.output_lock);
   free (output);
   free (threads);
 }