[mpich2-commits] r4006 - in mpich2/trunk/src/pm/hydra: bootstrap/ssh pm/central

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-11 03:06:04 -0500 (Wed, 11 Mar 2009)
New Revision: 4006

Modified:
   mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
   mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
Log:
Move the sh shell invocation to the bootstrap server, since this is
bootstrap server specific (e.g., fork will not need this invocation,
but ssh does).


Modified: mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c	2009-03-11 07:57:05 UTC (rev 4005)
+++ mpich2/trunk/src/pm/hydra/bootstrap/ssh/ssh_launch.c	2009-03-11 08:06:04 UTC (rev 4006)
@@ -58,10 +58,16 @@
             /* ssh does not support any partition names other than host names */
             client_arg[arg++] = MPIU_Strdup(partition->name);
 
+            client_arg[arg++] = MPIU_Strdup("sh");
+            client_arg[arg++] = MPIU_Strdup("-c");
+            client_arg[arg++] = MPIU_Strdup("\"");
+
             for (i = 0; partition->args[i]; i++)
                 client_arg[arg++] = MPIU_Strdup(partition->args[i]);
-            client_arg[arg] = NULL;
 
+            client_arg[arg++] = MPIU_Strdup("\"");
+            client_arg[arg++] = NULL;
+
             /* The stdin pointer will be some value for process_id 0;
              * for everyone else, it's NULL. */
             status =

Modified: mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-11 07:57:05 UTC (rev 4005)
+++ mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-11 08:06:04 UTC (rev 4006)
@@ -131,13 +131,6 @@
             partition->group_id = group_id++;
             partition->group_rank = 0;
 
-            /* Setup the executable arguments */
-            arg = 0;
-            partition->args[arg++] = MPIU_Strdup("sh");
-            partition->args[arg++] = MPIU_Strdup("-c");
-            partition->args[arg++] = MPIU_Strdup("\"");
-            partition->args[arg++] = NULL;
-
             /* Pass the entire environment here; the proxy will cherry
              * pick from this. */
             HYDU_Append_env(handle.system_env, partition->args, process_id);
@@ -202,10 +195,6 @@
             partition->args[arg] = NULL;
             HYDU_Append_exec(proc_params->exec, partition->args);
 
-            for (arg = 0; partition->args[arg]; arg++);
-            partition->args[arg++] = MPIU_Strdup("\"");
-            partition->args[arg++] = NULL;
-
             process_id += partition->proc_count;
         }
     }