Let the HNP only update the routing tree if necessary. Enable some debug output

This commit was SVN r19676.

orte/mca/plm/base/plm_base_launch_support.c

@@ -453,11 +453,15 @@ int orte_plm_base_daemon_callback(orte_std_cntr_t num_daemons)
                          "%s plm:base:daemon_callback completed",
                          ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
     
-    /* all done launching - update the num_procs in my local structure */
-    orte_process_info.num_procs = jdatorted->num_procs;
-    /* update the routing tree */
-    if (ORTE_SUCCESS != (rc = orte_routed.update_routing_tree())) {
-        ORTE_ERROR_LOG(rc);
+    /* all done launching - update the num_procs in my local structure if required
+     * so that any subsequent communications are correctly routed
+     */
+    if (orte_process_info.num_procs != jdatorted->num_procs) {
+        orte_process_info.num_procs = jdatorted->num_procs;
+        /* update the routing tree */
+        if (ORTE_SUCCESS != (rc = orte_routed.update_routing_tree())) {
+            ORTE_ERROR_LOG(rc);
+        }
     }
     
     /* if a tree-launch was underway, clear out the cmd */

orte/mca/routed/binomial/routed_binomial.c

@@ -1014,6 +1014,8 @@ static int binomial_tree(int rank, int parent, int me, int num_procs,
 
 static int update_routing_tree(void)
 {
+    orte_routed_tree_t *child;
+    int j;
     opal_list_item_t *item;
     
     /* if I am anything other than a daemon or the HNP, this
@@ -1036,11 +1038,7 @@ static int update_routing_tree(void)
                                    orte_process_info.num_procs,
                                    &num_children, &my_children, NULL);
     
-#if 0
-    {
-        orte_routed_tree_t *child;
-        int j;
-        
+    if (0 < opal_output_get_verbosity(orte_routed_base_output)) {
         opal_output(0, "%s: parent %d num_children %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), my_parent.vpid, num_children);
         for (item = opal_list_get_first(&my_children);
              item != opal_list_get_end(&my_children);
@@ -1054,7 +1052,6 @@ static int update_routing_tree(void)
             }
         }
     }
-#endif
 
     return ORTE_SUCCESS;
 }