Implement the xml formatted output of stdout/err/diag. Force -tag-output if -xml is set.

This commit was SVN r20302.

orte/mca/iof/base/iof_base_output.c

@@ -42,9 +42,9 @@ int orte_iof_base_write_output(orte_process_name_t *name, orte_iof_tag_t stream,
                                 unsigned char *data, int numbytes,
                                orte_iof_write_event_t *channel)
 {
-    char tag[ORTE_IOF_BASE_TAG_MAX], *suffix;
+    char starttag[ORTE_IOF_BASE_TAG_MAX], endtag[ORTE_IOF_BASE_TAG_MAX], *suffix;
     orte_iof_write_output_t *output;
-    int i, j, k, taglen, num_buffered;
+    int i, j, k, starttaglen, endtaglen, num_buffered;
 
     OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
                          "%s write:output setting up to write %d bytes to %s of %s",
@@ -60,13 +60,13 @@ int orte_iof_base_write_output(orte_process_name_t *name, orte_iof_tag_t stream,
         suffix = NULL;
     } else if (ORTE_IOF_STDOUT & stream) {
         /* write the bytes to stdout */
-        suffix = "<stdout>";
+        suffix = "stdout";
     } else if (ORTE_IOF_STDERR & stream) {
         /* write the bytes to stderr */
-        suffix = "<stderr>";
+        suffix = "stderr";
     } else if (ORTE_IOF_STDDIAG & stream) {
         /* write the bytes to stderr */
-        suffix = "<stddiag>";
+        suffix = "stddiag";
     } else {
         /* error - this should never happen */
         ORTE_ERROR_LOG(ORTE_ERR_VALUE_OUT_OF_BOUNDS);
@@ -77,29 +77,43 @@ int orte_iof_base_write_output(orte_process_name_t *name, orte_iof_tag_t stream,
     
     /* see if data is to be tagged */
     if (orte_tag_output && NULL != suffix) {
-        snprintf(tag, ORTE_IOF_BASE_TAG_MAX, "[%s,%s]%s",
+        /* if this is to be xml tagged, create a tag with the correct syntax */
-                 ORTE_LOCAL_JOBID_PRINT(name->jobid),
+        if (orte_xml_output) {
-                 ORTE_VPID_PRINT(name->vpid), suffix);
+            snprintf(starttag, ORTE_IOF_BASE_TAG_MAX, "<%s rank=\"%s\">", suffix, ORTE_VPID_PRINT(name->vpid));
-        taglen = strlen(tag);
+            snprintf(endtag, ORTE_IOF_BASE_TAG_MAX, "</%s>", suffix);
+        } else {
+            snprintf(starttag, ORTE_IOF_BASE_TAG_MAX, "[%s,%s]<%s>",
+                     ORTE_LOCAL_JOBID_PRINT(name->jobid),
+                     ORTE_VPID_PRINT(name->vpid), suffix);
+            memset(endtag, '\0', ORTE_IOF_BASE_TAG_MAX);
+        }
+        starttaglen = strlen(starttag);
+        endtaglen = strlen(endtag);
         /* start with the tag */
-        for (j=0, k=0; j < taglen; j++) {
+        for (j=0, k=0; j < starttaglen && k < ORTE_IOF_BASE_TAGGED_OUT_MAX; j++) {
-            output->data[k++] = tag[j];
+            output->data[k++] = starttag[j];
         }        
         /* cycle through the data looking for <cr>
          * and replace those with the tag
          */
-        for (i=0; i < numbytes-1; i++) {
+        for (i=0; i < numbytes && k < ORTE_IOF_BASE_TAGGED_OUT_MAX; i++) {
             if ('\n' == data[i]) {
-                /* move the <cr> first */
+                /* we need to break the line with the end tag */
+                for (j=0; j < endtaglen && k < ORTE_IOF_BASE_TAGGED_OUT_MAX; j++) {
+                    output->data[k++] = endtag[j];
+                }
+                /* move the <cr> over */
                 output->data[k++] = '\n';
-                for (j=0; j < taglen; j++) {
+                /* if this isn't the end of the line, add a new start tag */
-                    output->data[k++] = tag[j];
+                if (i < numbytes-1) {
+                    for (j=0; j < starttaglen && k < ORTE_IOF_BASE_TAGGED_OUT_MAX; j++) {
+                        output->data[k++] = starttag[j];
+                    }
                 }
             } else {
                 output->data[k++] = data[i];
             }
         }
-        output->data[k++] = data[numbytes-1];
         output->numbytes = k;
     } else {
         /* copy over the data to be written */

orte/runtime/orte_mca_params.c

@@ -219,6 +219,10 @@ int orte_register_params(void)
                                 "Display all output in XML format (default: false)",
                                 false, false, (int) false, &value);
     orte_xml_output = OPAL_INT_TO_BOOL(value);
+    /* if we requested xml output, be sure to tag the output as well */
+    if (orte_xml_output) {
+        orte_tag_output = true;
+    }
 
     mca_base_param_reg_int_name("orte", "show_resolved_nodenames",
                                 "Display any node names that are resolved to a different name (default: false)",