This is a checkpoint of some minor changes made in sequencing the startup - mainly to ensure that those helping me track a bug in mpirun2 are operating from an identical code base.

For everyone else, this is transparent.

This commit was SVN r2693.

src/runtime/ompi_rte_init_stage1.c

@@ -150,5 +150,23 @@ int ompi_rte_init_stage1(bool *allow_multi_user_threads, bool *have_hidden_threa
     *allow_multi_user_threads &= user_threads;
     *have_hidden_threads |= hidden_threads;
 
+    /*
+     * Name Server - just do the open so we can access base components
+     */
+    if (OMPI_SUCCESS != (ret = mca_ns_base_open())) {
+	/* JMS show_help */
+	printf("show_help: ompi_rte_init failed in ns_base_open\n");
+	return ret;
+    }
+
+    /*
+     * Process Control and Monitoring Client - just open for now
+     */
+    if (OMPI_SUCCESS != (ret = mca_pcmclient_base_open())) {
+	/* JMS show_help */
+	printf("show_help: ompi_rte_init failed in pcmclient_base_open\n");
+	return ret;
+    }
+
     return OMPI_SUCCESS;
 }

src/runtime/ompi_rte_init_stage2.c

@@ -37,13 +37,9 @@ int ompi_rte_init_stage2(bool *allow_multi_user_threads, bool *have_hidden_threa
     int pcm_modules_len;
 
     /*
-     * Name Server
+     * Name Server - base already opened in stage1, so just complete the selection
+     * of the proper module
      */
-    if (OMPI_SUCCESS != (ret = mca_ns_base_open())) {
-	/* JMS show_help */
-	printf("show_help: ompi_rte_init failed in ns_base_open\n");
-	return ret;
-    }
     user_threads = true;
     hidden_threads = false;
     if (OMPI_SUCCESS != (ret = mca_ns_base_select(&user_threads,
@@ -56,13 +52,9 @@ int ompi_rte_init_stage2(bool *allow_multi_user_threads, bool *have_hidden_threa
     *have_hidden_threads |= hidden_threads;
 
     /*
-     * Process Control and Monitoring Client
+     * Process Control and Monitoring Client - base already opened in stage1, so
+     * just complete selection of proper module
      */
-    if (OMPI_SUCCESS != (ret = mca_pcmclient_base_open())) {
-	/* JMS show_help */
-	printf("show_help: ompi_rte_init failed in pcmclient_base_open\n");
-	return ret;
-    }
     user_threads = true;
     hidden_threads = false;
     if (OMPI_SUCCESS != (ret = mca_pcmclient_base_select(&user_threads, 

src/tools/ompid/ompid.c

@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
 		    ompi_process_info.name->jobid, ompi_process_info.name->vpid);
     }
 
-     /* register the daemon callback function */
+     /* register the daemon main callback function */
     ret = mca_oob_recv_packed_nb(MCA_OOB_NAME_ANY, MCA_OOB_TAG_DAEMON, 0, ompi_daemon_recv, NULL);
     if(ret != OMPI_SUCCESS && ret != OMPI_ERR_NOT_IMPLEMENTED) {
 	ompi_output(0, "daemon callback not registered: error code %d", ret);