Revisions.

[pintos-anon] / src / tests / threads / p1-3.c

diff --git a/src/tests/threads/p1-3.c b/src/tests/threads/p1-3.c
index 32c91e6217dd4609893487681e089070c0f80169..6c16023c61b9efa9eb03366b4cdb8b415190edee 100644 (file)
--- a/src/tests/threads/p1-3.c
+++ b/src/tests/threads/p1-3.c
@@ -6,8 +6,13 @@
    <gmh@leland.stanford.edu>, Yu Ping Hu <yph@cs.stanford.edu>.
    Modified by arens. */
 
+#ifdef MLFQS
+#error This test not applicable with MLFQS enabled.
+#endif
+
 #include "threads/test.h"
 #include <stdio.h>
+#include "threads/synch.h"
 #include "threads/thread.h"
 
 static void test_preempt (void);
@@ -17,7 +22,7 @@ static void test_donate_return (void);
 void
 test (void) 
 {
-  /* Make sure our prority is the default. */
+  /* Make sure our priority is the default. */
   ASSERT (thread_get_priority () == PRI_DEFAULT);
 
   test_preempt ();
@@ -49,7 +54,7 @@ test_fifo (void)
           "If the order varies then there is a bug.\n");
 
   thread_set_priority (PRI_DEFAULT + 2);
-  for (i = 0; i < 5; i++) 
+  for (i = 0; i < 10; i++) 
     {
       char name[16];
       snprintf (name, sizeof name, "%d", i);
@@ -77,8 +82,8 @@ test_donate_return (void)
   thread_create ("acquire2", PRI_DEFAULT + 2, acquire_thread_func, &lock);
   printf ("This thread should have priority %d.  Actual priority: %d.\n",
           PRI_DEFAULT + 2, thread_get_priority ());
-  lock_release ();
-  printf ("acquire1 and acquire2 must already have finished, in that order.\n"
+  lock_release (&lock);
+  printf ("acquire2 and acquire1 must already have finished, in that order.\n"
           "This should be the last line before finishing this test.\n"
           "Priority donation test done.\n");
 }