Thanks George - you may ignore the note I just sent! :-) I am happy to
revisit the logic behind the prior work, without the time pressure of
dealing with it right away.
I do appreciate this!
Ralph
On Jun 24, 2009, at 5:48 PM, bosi...@osl.iu.edu wrote:
Author: bosilca
Date: 2009-06-24 19:48:14 EDT (Wed, 24 Jun 2009)
New Revision: 21517
URL: https://svn.open-mpi.org/trac/ompi/changeset/21517
Log:
Partially revert 21513. Beware of the exception on the
orte_launch_agent which
is treated apart in orte_plm_base_setup_orted_cmd.
Text files modified:
trunk/orte/mca/plm/base/plm_base_launch_support.c | 23 ++++++++
+--------------
1 files changed, 9 insertions(+), 14 deletions(-)
Modified: trunk/orte/mca/plm/base/plm_base_launch_support.c
=
=
=
=
=
=
=
=
======================================================================
--- trunk/orte/mca/plm/base/plm_base_launch_support.c (original)
+++ trunk/orte/mca/plm/base/plm_base_launch_support.c 2009-06-24
19:48:14 EDT (Wed, 24 Jun 2009)
@@ -1144,20 +1144,15 @@
if (ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) {
cnt = opal_argv_count(orted_cmd_line);
for (i=0; i < cnt; i+=3) {
- /* in the rsh environment, we can append multi-word
arguments
- * by enclosing them in quotes. Check for any multi-word
- * mca params passed to mpirun and include them
- */
- if (NULL != strchr(orted_cmd_line[i+2], ' ')) {
- char* param;
-
- /* must add quotes around it */
- asprintf(¶m, "\"%s\"", orted_cmd_line[i+2]);
- /* now pass it along */
- opal_argv_append(argc, argv, orted_cmd_line[i]);
- opal_argv_append(argc, argv, orted_cmd_line[i+1]);
- opal_argv_append(argc, argv, param);
- free(param);
+ /* if the specified option is more than one word, we
don't
+ * have a generic way of passing it as some
environments ignore
+ * any quotes we add, while others don't - so we ignore
any
+ * such options. In most cases, this won't be a problem
as
+ * they typically only apply to things of interest to
the HNP.
+ * Individual environments can add these back into the
cmd line
+ * as they know if it can be supported
+ */
+ if (NULL != strchr(orted_cmd_line[i+2], ' ')) {
continue;
}
/* The daemon will attempt to open the PLM on the remote
_______________________________________________
svn mailing list
s...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/svn
