[mpich2-commits] r4214 - mpich2/trunk/src/pm/hydra/launcher/mpiexec

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-03-27 15:18:48 -0500 (Fri, 27 Mar 2009)
New Revision: 4214

Modified:
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
Log:
Hydra job launcher can now boot proxies on multiple hosts

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-27 18:11:52 UTC (rev 4213)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-27 20:18:48 UTC (rev 4214)
@@ -304,16 +304,14 @@
     /* In the case of the proxy launcher, aka --boot-proxies, there is no executable
      * specified */
     if(handle.is_proxy_launcher || handle.is_proxy_terminator) {
-        if(handle.exec_info_list != NULL)
-            HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
-                "No executable should be specified when booting proxies\n");
 
         status = HYD_LCHU_get_current_exec_info(&exec_info);
         HYDU_ERR_POP(status, "get_current_exec_info returned error\n");
 
         exec_info->exec[0] = HYDU_strdup(HYD_PROXY_NAME" --persistent");
         exec_info->exec[1] = NULL;
-        exec_info->exec_proc_count = 1;
+        if(exec_info->exec_proc_count == 0)
+            exec_info->exec_proc_count = 1;
 
         env_name = HYDU_strdup("HYD_PROXY_PORT");
         env_value = HYDU_int_to_str(handle.pproxy_port);