[GNUnet-SVN] r26250 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-03-01 15:32:43 +0100 (Fri, 01 Mar 2013)
New Revision: 26250

Modified:
   gnunet/src/testbed/gnunet_testbed_mpi_spawn.c
Log:
finish off with MPI before spawning

Modified: gnunet/src/testbed/gnunet_testbed_mpi_spawn.c
===================================================================
--- gnunet/src/testbed/gnunet_testbed_mpi_spawn.c       2013-03-01 13:09:51 UTC 
(rev 26249)
+++ gnunet/src/testbed/gnunet_testbed_mpi_spawn.c       2013-03-01 14:32:43 UTC 
(rev 26250)
@@ -53,13 +53,16 @@
   {
     GNUNET_break (0);
     ret = 3;
-    goto finalize;
+    (void) MPI_Finalize ();
+    goto end;
   }
   if (0 != rank)
   {
     ret = 0;
-    goto finalize;
+    (void) MPI_Finalize ();
+    goto end;
   }
+  (void) MPI_Finalize ();
   PRINTF ("Spawning process\n");
   argv2 = GNUNET_malloc (sizeof (char *) * argc);
   for (cnt = 1; cnt < argc; cnt++)
@@ -71,7 +74,7 @@
   {
     LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot exec\n");
     ret = 5;
-    goto finalize;
+    goto end;
   }
   do
   {
@@ -82,18 +85,17 @@
   if (GNUNET_OK != chstat)
   { 
     ret = 6;
-    goto finalize;
+    goto end;
   }
   if (0 != code)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING, "Child terminated abnormally\n");
     ret = 50 + (int) code;
-    goto finalize;
+    goto end;
   }
   ret = 0;
   
- finalize:
-  (void) MPI_Finalize ();
+ end:  
   if (0 != ret)
     LOG (GNUNET_ERROR_TYPE_ERROR, "Something went wrong. Error: %d\n", ret);
   return ret;