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

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

diff --git a/grading/userprog/multi-oom.c b/grading/userprog/multi-oom.c
index 2ad63e90e3060555bee3b939b61e4dcc8e33f2ea..cfdda6692beb1b80aefc57ff533309372a649db1 100644 (file)
--- a/grading/userprog/multi-oom.c
+++ b/grading/userprog/multi-oom.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-oom) fail: join(exec(\"%s\")) returned %d\n",
+        printf ("(multi-oom) fail: wait(exec(\"%s\")) returned %d\n",
                 child_cmd, code);
     }
   else if (n < 15)