Get rid of unnecessary barrier. Improve comment.

[pintos-anon] / src / tests / userprog / recursor.c

diff --git a/src/tests/userprog/recursor.c b/src/tests/userprog/recursor.c
index b7422f1094f4c4590af1db7254541a1d9796699b..79c784a991b3d10414e76dfc6ed4af245e483ad4 100644 (file)
--- a/src/tests/userprog/recursor.c
+++ b/src/tests/userprog/recursor.c
@@ -11,7 +11,7 @@ main (int argc, char *argv[])
 
   if (argc != 4) 
     {
-      printf ("usage: recursor <string> <depth> <joinp>\n");
+      printf ("usage: recursor <string> <depth> <waitp>\n");
       exit (1);
     }
 
@@ -19,13 +19,16 @@ main (int argc, char *argv[])
   printf ("%s %s %s %s\n", argv[0], argv[1], argv[2], argv[3]);
 
   /* Execute child and wait for it to finish if requested. */
-  snprintf (buffer, sizeof buffer,
-            "recursor fork %d %s", atoi (argv[2]) + 1, argv[3]);
-  pid = exec (buffer);
-  if (atoi (argv[3]))
-    retval = join (pid);
-
+  if (atoi (argv[2]) != 0) 
+    {
+      snprintf (buffer, sizeof buffer,
+                "recursor %s %d %s", argv[1], atoi (argv[2]) - 1, argv[3]);
+      pid = exec (buffer);
+      if (atoi (argv[3]))
+        retval = wait (pid);
+    }
+  
   /* Done. */
-  printf ("%s: dying, retval=%d\n", argv[1], retval);
+  printf ("%s %s: dying, retval=%d\n", argv[1], argv[2], retval);
   exit (retval);
 }