X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fvm%2Fpage-merge-par.c;h=36f7840bdf68b88053726690548e2e08fcaa344f;hb=2cfc156c39840ce7f1cda6b473de1322691a8a0b;hp=06209e8359b1e6cd9a251964dbee91338b6e0b98;hpb=9d6ad9a479ddae9628dc2d45862f9281986c430b;p=pintos-anon

diff --git a/grading/vm/page-merge-par.c b/grading/vm/page-merge-par.c
index 06209e8..36f7840 100644
--- 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");