There is no reason for tools to have an async progress thread as they can loop the event library themselves. This has the added benefit of causing the tool to "block" while waiting for events so they don't use cpu.

Also, fix orte-submit so it appropriately handles --help option

For v2.0.0: fixes open-mpi#805

(cherry picked from commit open-mpi/ompi@836f495)

Author: Ralph Castain

orte/mca/ess/base/ess_base_std_tool.c

@@ -58,8 +58,6 @@
 
 #include "orte/mca/ess/base/base.h"
 
-static bool progress_thread_running = false;
-
 int orte_ess_base_tool_setup(void)
 {
     int ret;
@@ -72,19 +70,6 @@ int orte_ess_base_tool_setup(void)
     orte_process_info.super.proc_arch = opal_local_arch;
     opal_proc_local_set(&orte_process_info.super);
 
-    if (NULL != orte_process_info.my_hnp_uri) {
-        /* if we were given an HNP, then we want
-         * to look like an application as well as being a tool.
-         * Need to do this before opening the routed framework
-         * so it will do the right things.
-         */
-        orte_process_info.proc_type |= ORTE_PROC_NON_MPI;
-        /* get a separate orte event base */
-        orte_event_base = opal_start_progress_thread("orte", true);
-        progress_thread_running = true;
-        orte_event_base_active = true;
-    }
-
     /* open and setup the state machine */
     if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_state_base_framework, 0))) {
         ORTE_ERROR_LOG(ret);
@@ -242,10 +227,5 @@ int orte_ess_base_tool_finalize(void)
     (void) mca_base_framework_close(&orte_schizo_base_framework);
     (void) mca_base_framework_close(&orte_errmgr_base_framework);
 
-    /* release the event base */
-    if (progress_thread_running) {
-        opal_progress_thread_finalize("orte");
-        progress_thread_running = false;
-    }
     return ORTE_SUCCESS;
 }

orte/tools/orte-submit/orte-submit.c

@@ -317,7 +317,7 @@ static opal_cmd_line_init_t cmd_line_init[] = {
       &myglobals.run_as_root, OPAL_CMD_LINE_TYPE_BOOL,
       "Allow execution as root (STRONGLY DISCOURAGED)" },
 
-/* End of list */
+    /* End of list */
     { NULL, '\0', NULL, NULL, 0,
       NULL, OPAL_CMD_LINE_TYPE_NULL, NULL }
 };
@@ -408,8 +408,8 @@ int main(int argc, char *argv[])
         fprintf(stderr, "--------------------------------------------------------------------------\n");
         exit(1);
     }
-
-    /*
+ 
+     /*
      * Since this process can now handle MCA/GMCA parameters, make sure to
      * process them.
      */
@@ -714,12 +714,16 @@ int main(int argc, char *argv[])
     orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, req, ORTE_RML_TAG_DAEMON, orte_rml_send_callback, NULL);
 
     // wait for response and unpack the status, jobid
-    ORTE_WAIT_FOR_COMPLETION(myspawn);
+    while (myspawn) {
+      opal_event_loop(orte_event_base, OPAL_EVLOOP_ONCE);
+    }
     opal_output(0, "Job %s has launched", ORTE_JOBID_PRINT(jdata->jobid));
 
  waiting:
-    ORTE_WAIT_FOR_COMPLETION(mywait);
-
+    while (mywait) {
+      opal_event_loop(orte_event_base, OPAL_EVLOOP_ONCE);
+    }
+ 
  DONE:
     /* cleanup and leave */
     orte_finalize();