orte/iof: Add app stderr to stdout redirection at source

 * Add an MCA parameter to combine stdout and stderr at the source
   - `iof_base_redirect_app_stderr_to_stdout`
 * Aids in user debugging when using libraries that mix stderr with stdout

Signed-off-by: Joshua Hursey <[email protected]>
(cherry picked from commit 0e9a06d)
Signed-off-by: Joshua Hursey <[email protected]>

Author: jjhursey

orte/mca/iof/base/base.h

@@ -131,6 +131,7 @@ struct orte_iof_base_t {
     char                    *input_files;
     orte_iof_sink_t         *iof_write_stdout;
     orte_iof_sink_t         *iof_write_stderr;
+    bool                    redirect_app_stderr_to_stdout;
 };
 typedef struct orte_iof_base_t orte_iof_base_t;
 

orte/mca/iof/base/iof_base_frame.c

@@ -14,6 +14,7 @@
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -204,6 +205,15 @@ static int orte_iof_base_register(mca_base_register_flag_t flags)
                                  MCA_BASE_VAR_SCOPE_READONLY,
                                  &orte_iof_base.input_files);
 
+    /* Redirect application stderr to stdout (at source) */
+    orte_iof_base.redirect_app_stderr_to_stdout = false;
+    (void) mca_base_var_register("orte", "iof","base", "redirect_app_stderr_to_stdout",
+                                 "Redirect application stderr to stdout at source (default: false)",
+                                 MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
+                                 OPAL_INFO_LVL_9,
+                                 MCA_BASE_VAR_SCOPE_READONLY,
+                                 &orte_iof_base.redirect_app_stderr_to_stdout);
+
     return ORTE_SUCCESS;
 }
 

orte/mca/iof/base/iof_base_setup.c

@@ -66,6 +66,7 @@
 #include "orte/runtime/orte_globals.h"
 
 #include "orte/mca/iof/iof.h"
+#include "orte/mca/iof/base/base.h"
 #include "orte/mca/iof/base/iof_base_setup.h"
 
 int
@@ -151,11 +152,19 @@ orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts, char ***env)
         }
         ret = dup2(opts->p_stdout[1], fileno(stdout));
         if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+        if( orte_iof_base.redirect_app_stderr_to_stdout ) {
+            ret = dup2(opts->p_stdout[1], fileno(stderr));
+            if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+        }
         close(opts->p_stdout[1]);
     } else {
         if(opts->p_stdout[1] != fileno(stdout)) {
             ret = dup2(opts->p_stdout[1], fileno(stdout));
             if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+            if( orte_iof_base.redirect_app_stderr_to_stdout ) {
+                ret = dup2(opts->p_stdout[1], fileno(stderr));
+                if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+            }
             close(opts->p_stdout[1]);
         }
     }
@@ -176,9 +185,12 @@ orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts, char ***env)
             close(fd);
         }
     }
+
     if(opts->p_stderr[1] != fileno(stderr)) {
-        ret = dup2(opts->p_stderr[1], fileno(stderr));
-        if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+        if( !orte_iof_base.redirect_app_stderr_to_stdout ) {
+            ret = dup2(opts->p_stderr[1], fileno(stderr));
+            if (ret < 0) return ORTE_ERR_PIPE_SETUP_FAILURE;
+        }
         close(opts->p_stderr[1]);
     }