Merge pull request pmodels#7295 from hzhou/2502_hydra_configfile

hydra: fix line-continuation in --configfile option

Approved-by: Ken Raffenetti

Author: hzhou

src/pm/hydra/lib/utils/args.c

@@ -328,7 +328,6 @@ HYD_status HYDU_parse_hostfile(const char *hostfile, void *data,
 
         linep = line;
 
-        strtok(linep, "#");
         while (isspace(*linep))
             linep++;
 

src/pm/hydra/mansrc/mpiexec.txt

@@ -19,10 +19,11 @@ The MPI standard suggests the following arguments and their meanings\:
 + \-n <np> - Specify the number of processes to use
 . \-host <hostname> - Name of host on which to run processes
 . \-wdir <working directory> - cd to this one `before` running executable
-- \-configfile <name> - file containing specifications of host/program,
-   one per line, with # as a comment indicator, e.g., the usual
-   mpiexec input. The lines excluding comments are concatenated with newlines
-   replaced with spaces, and are then parsed as command line options.
+- \-configfile <name> - file containing command-line options.
+   The lines are of the form separated by the colons in the commandline form:
+       mpiexec {<option arguments>} : {...} : {...} : ... : {...}
+   Lines beginning with '#' are comments, and lines may be continued by
+   terminating the partial line with '\'.
 
 The following options are reserved by the MPI standard, but they are not
 supported by MPICH (hydra)\:

src/pm/hydra/mpiexec/get_parameters.c

@@ -281,16 +281,18 @@ static HYD_status check_environment(void)
 
 static HYD_status process_config_token(char *token, int newline, void *data)
 {
-    static int idx = 0;
     UT_array *args = data;
 
     char **last_arg = (char **) utarray_back(args);
-    if (idx && newline && strcmp(*last_arg, ":")) {
-        /* If this is a newline, but not the first one, and the
-         * previous token was not a ":", add an executable delimiter
-         * ':' */
-        static const char *colon = ":";
-        utarray_push_back(args, &colon, MPL_MEM_OTHER);
+    if (last_arg && newline) {
+        if (strcmp(*last_arg, "\\") == 0) {
+            /* remove the trailing line-continuation mark */
+            utarray_pop_back(args);
+        } else if (strcmp(*last_arg, ":") != 0) {
+            /* add ":" delimiter unless it is already there */
+            static const char *colon = ":";
+            utarray_push_back(args, &colon, MPL_MEM_OTHER);
+        }
     }
 
     utarray_push_back(args, &token, MPL_MEM_OTHER);

src/pm/hydra/mpiexec/options.c

@@ -646,7 +646,8 @@ static void config_help_fn(void)
     printf("-configfile: Configuration file for MPMD launch argument information\n\n");
     printf("Notes:\n");
     printf("  * The config file contains information very similar to a command-line\n");
-    printf("    launch, except ':' is replaced with a new line character\n");
+    printf("    launch, except ':' is replaced with a new line character. Use '\'\n");
+    printf("    partial lines.\n");
 }
 
 static HYD_status config_fn(char *arg, char ***argv)