[svn-r9003] Allow the user to specify a custom host list to the PBS launcher. The

translation of the user-specified information to PBS specific
information is not as efficient as it can be.

Reviewed by chan.

src/pm/hydra/tools/bootstrap/external/pbs_launch.c

@@ -8,6 +8,33 @@
 #include "bsci.h"
 #include "pbs.h"
 
+static struct HYD_node *pbs_node_list = NULL;
+
+static HYD_status find_pbs_node_id(const char *hostname, int *node_id)
+{
+    struct HYD_node *t;
+    HYD_status status = HYD_SUCCESS;
+
+    HYDU_FUNC_ENTER();
+
+    *node_id = 0;
+    for (t = pbs_node_list; t; t = t->next) {
+        if (!strcmp(hostname, t->hostname))
+            break;
+        *node_id += t->core_count;
+    }
+
+    HYDU_ERR_CHKANDJUMP(status, t == NULL, HYD_INTERNAL_ERROR,
+                        "user specified host not in the PBS allocated list\n");
+
+  fn_exit:
+    HYDU_FUNC_EXIT();
+    return status;
+
+  fn_fail:
+    goto fn_exit;
+}
+
 HYD_status HYDT_bscd_pbs_launch_procs(char **args, struct HYD_proxy *proxy_list,
                                       int *control_fd)
 {
@@ -18,12 +45,12 @@ HYD_status HYDT_bscd_pbs_launch_procs(char **args, struct HYD_proxy *proxy_list,
 
     HYDU_FUNC_ENTER();
 
-    /* If the RMK is not PBS, error out for the time being. This needs
-     * to be modified to reparse the host file and find the spawn IDs
-     * separately. */
-    if (strcmp(HYDT_bsci_info.rmk, "pbs"))
-        HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
-                            "using a non-PBS RMK with the PBS launcher is not supported\n");
+    /* If the RMK is not PBS, query for the PBS node list, and convert
+     * the user-specified node IDs to PBS node IDs */
+    if (strcmp(HYDT_bsci_info.rmk, "pbs")) {
+        status = HYDT_bscd_pbs_query_node_list(&pbs_node_list);
+        HYDU_ERR_POP(status, "error querying PBS node list\n");
+    }
 
     proxy_count = 0;
     for (proxy = proxy_list; proxy; proxy = proxy->next)
@@ -43,17 +70,37 @@ HYD_status HYDT_bscd_pbs_launch_procs(char **args, struct HYD_proxy *proxy_list,
      * spawning. */
     hostid = 0;
     for (i = 0, proxy = proxy_list; proxy; proxy = proxy->next, i++) {
+        if (pbs_node_list) {
+            status = find_pbs_node_id(proxy->node->hostname, &hostid);
+            HYDU_ERR_POP(status, "error finding PBS node ID for host %s\n",
+                         proxy->node->hostname);
+        }
+
         targs[args_count] = HYDU_int_to_str(i);
 
         /* The task_id field is not filled in during tm_spawn(). The
          * TM library just stores this address and fills it in when
          * the event is completed by a call to tm_poll(). */
+        if (HYDT_bsci_info.debug) {
+            HYDU_dump(stdout, "Spawn arguments (host id %d): ", hostid);
+
+            /* NULL terminate the arguments list to pass to
+             * HYDU_print_strlist() */
+            targs[args_count + 1] = NULL;
+            HYDU_print_strlist(targs);
+        }
+
+        /* The args_count below does not include the possible NULL
+         * termination, as I'm not sure how tm_spawn() handles NULL
+         * arguments. Besides the last NULL string is not needed for
+         * tm_spawn(). */
         err = tm_spawn(args_count + 1, targs, NULL, hostid, &HYDT_bscd_pbs_sys->task_id[i],
                        &HYDT_bscd_pbs_sys->spawn_events[i]);
         HYDU_ERR_CHKANDJUMP(status, err != TM_SUCCESS, HYD_INTERNAL_ERROR,
                             "tm_spawn() failed with TM error %d\n", err);
 
-        hostid += proxy->node->core_count;
+        if (!pbs_node_list)
+            hostid += proxy->node->core_count;
     }
     HYDT_bscd_pbs_sys->spawn_count = i;