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 06209e8359b1e6cd9a251964dbee91338b6e0b98..36f7840bdf68b88053726690548e2e08fcaa344f 100644 (file)
--- a/grading/vm/page-merge-par.c
+++ b/grading/vm/page-merge-par.c
@@ -35,7 +35,7 @@ init (void)
 
 /* Sort each chunk of buf1 using a subprocess. */
 static void
-sort (void)
+sort_chunks (void)
 {
   pid_t children[CHUNK_CNT];
   size_t i;
@@ -75,9 +75,9 @@ sort (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);
         }
 
@@ -162,7 +162,7 @@ main (void)
 {
   printf ("(page-merge-par) begin\n");
   init ();
-  sort ();
+  sort_chunks ();
   merge ();
   verify ();
   printf ("(page-merge-par) end\n");