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

[pintos-anon] / grading / vm / page-merge-par.c

diff --git a/grading/vm/page-merge-par.c b/grading/vm/page-merge-par.c
index 8f3be48cbb64816ab0860f22de9b19a5baaa2935..36f7840bdf68b88053726690548e2e08fcaa344f 100644 (file)
--- a/grading/vm/page-merge-par.c
+++ b/grading/vm/page-merge-par.c
@@ -75,9 +75,9 @@ sort_chunks (void)
       char fn[128];
       int fd;
 
-      if (join (children[i]) != 123) 
+      if (wait (children[i]) != 123) 
         {
-          printf ("(page-merge-par) join(exec()) returned bad value\n");
+          printf ("(page-merge-par) wait(exec()) returned bad value\n");
           exit (1);
         }