Ensure that the display-map and display-allocation outputs get processed through the new OPAL filter framework by passing them through orte_output instead of using the opal_dss.dump function.

This commit was SVN r18507.

orte/mca/ras/base/ras_base_allocate.c

@@ -47,6 +47,7 @@ int orte_ras_base_allocate(orte_job_t *jdata)
     orte_std_cntr_t i;
     bool override_oversubscribed;
     orte_app_context_t **apps;
+    char *output;
 
     ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output,
                          "%s ras:base:allocate",
@@ -289,7 +290,12 @@ DISPLAY:
             if (NULL == alloc[i]) {
                 break;
             }
-            opal_dss.dump(orte_ras_base.alloc_output, alloc[i], ORTE_NODE);
+            if (ORTE_SUCCESS != (rc = opal_dss.print(&output, NULL, alloc[i], ORTE_NODE))) {
+                ORTE_ERROR_LOG(rc);
+                return rc;
+            }
+            orte_output(orte_ras_base.alloc_output, "%s", output);
+            free(output);
         }
     }
     

orte/mca/rmaps/base/rmaps_base_map_job.c

@@ -29,6 +29,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/runtime/orte_globals.h"
 #include "orte/util/name_fns.h"
+#include "orte/util/output.h"
 
 #include "orte/mca/rmaps/base/base.h"
 #include "orte/mca/rmaps/base/rmaps_private.h"
@@ -41,6 +42,7 @@
 int orte_rmaps_base_map_job(orte_job_t *jdata)
 {
     orte_job_map_t *map=NULL;
+    char *output=NULL;
     int rc;
     
     /* NOTE: NO PROXY COMPONENT REQUIRED - REMOTE PROCS ARE NOT
@@ -89,12 +91,17 @@ int orte_rmaps_base_map_job(orte_job_t *jdata)
     
     /* if we wanted to display the map, now is the time to do it */
     if (jdata->map->display_map) {
-        opal_dss.dump(orte_rmaps_base.map_output, jdata->map, ORTE_JOB_MAP);
+        if (ORTE_SUCCESS != (rc = opal_dss.print(&output, NULL, jdata->map, ORTE_JOB_MAP))) {
+            ORTE_ERROR_LOG(rc);
+            goto CLEANUP;
+        }
+        orte_output(orte_rmaps_base.map_output, "%s", output);
     }
     
     return ORTE_SUCCESS;
     
 CLEANUP:
     if (NULL != map) OBJ_RELEASE(map);
+    if (NULL != output) free(output);
     return rc;
 }