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

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

diff --git a/grading/vm/page-merge-seq.c b/grading/vm/page-merge-seq.c
index 203ca9cd25ac42b6ad34da57c3983eaf3c851365..34d14f66cb49238cd03aaad21731fce9a66a727c 100644 (file)
--- a/grading/vm/page-merge-seq.c
+++ b/grading/vm/page-merge-seq.c
@@ -35,7 +35,7 @@ init (void)
 
 /* Sort each chunk of buf1 using a subprocess. */
 static void
-sort (void)
+sort_chunks (void)
 {
   size_t i;
 
@@ -64,9 +64,9 @@ sort (void)
           printf ("(page-merge-seq) exec() failed\n");
           exit (1);
         }
-      if (join (child) != 123) 
+      if (wait (child) != 123) 
         {
-          printf ("(page-merge-seq) join(exec()) returned bad value\n");
+          printf ("(page-merge-seq) wait(exec()) returned bad value\n");
           exit (1);
         }
 
@@ -150,7 +150,7 @@ main (void)
 {
   printf ("(page-merge-seq) begin\n");
   init ();
-  sort ();
+  sort_chunks ();
   merge ();
   verify ();
   printf ("(page-merge-seq) end\n");