[mpich2-commits] r4077 - in mpich2/trunk/src/pm/hydra/bootstrap: fork include src ssh

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-14 23:24:55 -0500 (Sat, 14 Mar 2009)
New Revision: 4077

Modified:
   mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_init.c
   mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c
   mpich2/trunk/src/pm/hydra/bootstrap/include/bsci.h
   mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_init.c
   mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_launch.c
   mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_init.c
   mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
Log:
Warning stomp.

Modified: mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_init.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_init.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_init.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -18,10 +18,7 @@
 
     HYD_BSCI_fns.launch_procs = HYD_BSCD_fork_launch_procs;
 
-  fn_exit:
     HYDU_FUNC_EXIT();
-    return status;
 
-  fn_fail:
-    goto fn_exit;
+    return status;
 }

Modified: mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/fork/fork_launch.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -8,6 +8,7 @@
 #include "hydra_utils.h"
 #include "bsci.h"
 #include "bscu.h"
+#include "fork.h"
 
 HYD_Handle handle;
 

Modified: mpich2/trunk/src/pm/hydra/bootstrap/include/bsci.h
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/include/bsci.h	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/include/bsci.h	2009-03-15 04:24:55 UTC (rev 4077)
@@ -19,6 +19,7 @@
 extern struct HYD_BSCI_fns HYD_BSCI_fns;
 
 HYD_Status HYD_BSCI_init(char * bootstrap);
+HYD_Status HYD_BSCI_launch_procs(void);
 HYD_Status HYD_BSCI_finalize(void);
 HYD_Status HYD_BSCI_get_usize(int *size);
 HYD_Status HYD_BSCI_wait_for_completion(void);

Modified: mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_init.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_init.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_init.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -22,9 +22,9 @@
     HYD_BSCI_fns.finalize = NULL;
 
     if (!strcmp(bootstrap, "ssh"))
-        HYD_BSCI_ssh_init();
+        status = HYD_BSCI_ssh_init();
     else if (!strcmp(bootstrap, "fork"))
-        HYD_BSCI_fork_init();
+        status = HYD_BSCI_fork_init();
     else {
         HYDU_Error_printf("unrecognized bootstrap server: %s\n", bootstrap);
         status = HYD_INTERNAL_ERROR;

Modified: mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_launch.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/src/bsci_launch.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -17,10 +17,7 @@
 
     status = HYD_BSCI_fns.launch_procs();
 
-  fn_exit:
     HYDU_FUNC_EXIT();
-    return status;
 
-  fn_fail:
-    goto fn_exit;
+    return status;
 }

Modified: mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_init.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_init.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_init.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -19,10 +19,7 @@
 
     HYD_BSCI_fns.launch_procs = HYD_BSCD_ssh_launch_procs;
 
-  fn_exit:
     HYDU_FUNC_EXIT();
-    return status;
 
-  fn_fail:
-    goto fn_exit;
+    return status;
 }

Modified: mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c	2009-03-15 04:02:00 UTC (rev 4076)
+++ mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c	2009-03-15 04:24:55 UTC (rev 4077)
@@ -8,6 +8,7 @@
 #include "hydra_utils.h"
 #include "bsci.h"
 #include "bscu.h"
+#include "ssh.h"
 
 HYD_Handle handle;