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

[pintos-anon] / grading / userprog / multi-recurse.c

diff --git a/grading/userprog/multi-recurse.c b/grading/userprog/multi-recurse.c
index 48692e295c84ef2ad06f0b15734ce2e164651b5f..4a69d84eb00901728252fb5088b608f52c23a250 100644 (file)
--- a/grading/userprog/multi-recurse.c
+++ b/grading/userprog/multi-recurse.c
@@ -20,9 +20,9 @@ main (int argc UNUSED, char *argv[])
       child_pid = exec (child_cmd);
       if (child_pid != -1) 
         {
-          int code = join (child_pid);
+          int code = wait (child_pid);
           if (code != n - 1)
-            printf ("(multi-recurse) fail: join(exec(\"%s\")) returned %d\n",
+            printf ("(multi-recurse) fail: wait(exec(\"%s\")) returned %d\n",
                     child_cmd, code);
         }
       else