X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fthreads%2Fp1-3.c;h=6c16023c61b9efa9eb03366b4cdb8b415190edee;hb=69327564190e37d88e8d18e276190859f91120a0;hp=264ad477ec7ab069c14f6b0ebcd7aa84a9ca7f5a;hpb=4fa4789e8ae898ef8a2e3fe15a27262e9f2e6c0b;p=pintos-anon diff --git a/src/tests/threads/p1-3.c b/src/tests/threads/p1-3.c index 264ad47..6c16023 100644 --- a/src/tests/threads/p1-3.c +++ b/src/tests/threads/p1-3.c @@ -6,6 +6,10 @@ , Yu Ping Hu . Modified by arens. */ +#ifdef MLFQS +#error This test not applicable with MLFQS enabled. +#endif + #include "threads/test.h" #include #include "threads/synch.h" @@ -18,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 (); @@ -50,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); @@ -79,7 +83,7 @@ test_donate_return (void) printf ("This thread should have priority %d. Actual priority: %d.\n", PRI_DEFAULT + 2, thread_get_priority ()); lock_release (&lock); - printf ("acquire1 and acquire2 must already have finished, in that order.\n" + 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"); }