Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / grading / threads / tests.txt

diff --git a/grading/threads/tests.txt b/grading/threads/tests.txt
index f2ad06c1cc4678a98c5e63e832cd2b1fda78689e..2a27bb27ac221151d5c18fec7108f68a1452831f 100644 (file)
--- a/grading/threads/tests.txt
+++ b/grading/threads/tests.txt
@@ -11,17 +11,7 @@ Problem 1-1: Alarm Clock
   -1 alarm-negative: Negative wait time must not crash or hang
 Score: /8
 
-Problem 1-2: Join
-  -2 join-simple: A creates B, A joins B (public)
-  -2 join-quick: A creates B, A joins B, with different details (public)
-  -2 join-multiple: A creates B and C, A joins B, A joins C (public)
-  -2 join-nested: A creates B, B creates C, ..., B joins C, A joins B
-  -2 join-dummy: A creates B, A joins B, A joins B
-  -2 join-invalid: Joining an invalid tid must not crash or hang
-  -2 join-no: Creating a thread and never joining it must not crash or hang
-Score: /14
-
-Problem 1-3: Priority Scheduler
+Problem 1-2: Priority Scheduler
   -2 priority-preempt: Higher-priority thread preempts others (public)
   -2 priority-fifo: Threads of equal priority run round-robin (public)
   -2 priority-donate-one: Priority donation with single lock (public)
@@ -29,7 +19,7 @@ Problem 1-3: Priority Scheduler
   -2 priority-donate-nest: Nested priority donation with single lock
 Score: /10
 
-Problem 1-4: Advanced Scheduler
+Problem 1-3: Advanced Scheduler
   -4 mlfqs-speedup: Public testcase doesn't run faster with MLFQS
   -4 mlfqs-priority: Priorities don't change properly
 Score: /8