May as well have the other "clean" outputs use the same channel

This commit was SVN r20082.

orte/mca/ras/base/base.h

@@ -41,7 +41,6 @@ ORTE_DECLSPEC int orte_ras_base_open(void);
  */
 typedef struct orte_ras_base_t {
     int ras_output;
-    int alloc_output;
     opal_list_t ras_opened;
     bool allocation_read;
     bool display_alloc;

orte/mca/ras/base/ras_base_allocate.c

@@ -335,9 +335,9 @@ DISPLAY:
             }
         }
         if (orte_xml_output) {
-            opal_output(orte_ras_base.alloc_output, "%s</allocation>\n", tmp);
+            opal_output(orte_clean_output, "%s</allocation>\n", tmp);
         } else {
-            opal_output(orte_ras_base.alloc_output, "%s\n\n=================================================================\n", tmp);
+            opal_output(orte_clean_output, "%s\n\n=================================================================\n", tmp);
         }
         free(tmp);
     }

orte/mca/ras/base/ras_base_node.c

@@ -122,9 +122,9 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata)
             if (orte_show_resolved_nodenames &&
                 0 != strcmp(node->name, hnp_node->name)) {
                 if (orte_xml_output) {
-                    opal_output(0, "<noderesolve name=\"%s\" resolved=\"%s\">", node->name, hnp_node->name);
+                    opal_output(orte_clean_output, "<noderesolve name=\"%s\" resolved=\"%s\"/>", node->name, hnp_node->name);
                 } else {
-                    opal_output(0, "node name %s resolved to %s", node->name, hnp_node->name);
+                    opal_output(orte_clean_output, "node name %s resolved to %s", node->name, hnp_node->name);
                 }
             }
             

orte/mca/ras/base/ras_base_open.c

@@ -75,7 +75,6 @@ orte_ras_base_t orte_ras_base;
 int orte_ras_base_open(void)
 {
     int value;
-    opal_output_stream_t lds;
     bool btmp;
     
     /* set default flags */
@@ -102,11 +101,6 @@ int orte_ras_base_open(void)
         verbose set by the mca open system... */
     orte_ras_base.ras_output = opal_output_open(NULL);
     
-    OBJ_CONSTRUCT(&lds, opal_output_stream_t);
-    lds.lds_want_stdout = true;
-    orte_ras_base.alloc_output = opal_output_open(&lds);
-    OBJ_DESTRUCT(&lds);
-    
     /* Open up all available components */
     if (ORTE_SUCCESS != 
         mca_base_components_open("ras", orte_ras_base.ras_output,

orte/mca/rmaps/base/base.h

@@ -52,7 +52,6 @@ ORTE_DECLSPEC int orte_rmaps_base_open(void);
 typedef struct {
     /** Verbose/debug output stream */
     int rmaps_output;
-    int map_output;
     /** List of available components */
     opal_list_t available_components;
     /** selected module */

orte/mca/rmaps/base/rmaps_base_map_job.c

@@ -92,7 +92,7 @@ int orte_rmaps_base_map_job(orte_job_t *jdata)
     if (jdata->map->display_map) {
         char *output;
         opal_dss.print(&output, NULL, jdata->map, ORTE_JOB_MAP);
-        opal_output(orte_rmaps_base.map_output, "%s", output);
+        opal_output(orte_clean_output, "%s", output);
         free(output);
     }
     

orte/mca/rmaps/base/rmaps_base_open.c

@@ -78,7 +78,6 @@ int orte_rmaps_base_open(void)
 {
     int param, value;
     char *policy;
-    opal_output_stream_t lds;
     bool btmp;
 
     /* init the globals */
@@ -88,11 +87,6 @@ int orte_rmaps_base_open(void)
         verbose set by the mca open system... */
     orte_rmaps_base.rmaps_output = opal_output_open(NULL);
 
-    OBJ_CONSTRUCT(&lds, opal_output_stream_t);
-    lds.lds_want_stdout = true;
-    orte_rmaps_base.map_output = opal_output_open(&lds);
-    OBJ_DESTRUCT(&lds);
-    
     /* Are we scheduling by node or by slot? */
     param = mca_base_param_reg_string_name("rmaps", "base_schedule_policy",
                                            "Scheduling Policy for RMAPS. [slot | node]",