* add missing files from pty commit

This commit was SVN r5402.

src/mca/iof/base/iof_base_setup.c

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include "ompi_config.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#ifdef HAVE_UTIL_H
+#include <util.h>
+#endif
+#ifdef HAVE_PTY_H
+#include <pty.h>
+#endif
+
+#include "iof_base_setup.h"
+
+#include "include/orte_constants.h"
+#include "util/output.h"
+#include "mca/errmgr/errmgr.h"
+#include "mca/iof/iof.h"
+#include "mca/ns/ns.h"
+
+int
+iof_base_setup_prefork(mca_iof_base_io_conf_t *opts)
+{
+    int ret;
+
+    /* first check to make sure we can do ptys */
+#if (! defined(HAVE_OPENPTY)) || (OMPI_ENABLE_PTY_SUPPORT == 0)
+    opts->usepty = 0;
+#endif
+
+    fflush(stdout);
+
+#if defined(HAVE_OPENPTY) && OMPI_ENABLE_PTY_SUPPORT
+    if (opts->usepty) {
+        ret = openpty(&(opts->p_stdout[0]), &(opts->p_stdout[1]),
+                      NULL, NULL, NULL);
+    }
+#else
+    ret = -1;
+#endif
+    if (ret < 0) {
+        if (pipe(opts->p_stdout) < 0) {
+            ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
+            return ORTE_ERR_OUT_OF_RESOURCE;
+        }
+        if (pipe(opts->p_stdin) < 0) {
+            ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
+            return ORTE_ERR_OUT_OF_RESOURCE;
+        }
+    }
+    if (pipe(opts->p_stderr) < 0) {
+        ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
+        return ORTE_ERR_OUT_OF_RESOURCE;
+    }
+
+    return OMPI_SUCCESS;
+}
+
+
+int
+iof_base_setup_child(mca_iof_base_io_conf_t *opts)
+{
+    int ret;
+
+    if (! opts->usepty) {
+        close(opts->p_stdout[0]);
+        close(opts->p_stdin[0]);
+    }
+    close(opts->p_stderr[0]);
+
+    if (opts->usepty) {
+        ret = dup2(opts->p_stdout[1], fileno(stdin)); 
+        if (ret < 0) return OMPI_ERROR;
+        ret = dup2(opts->p_stdout[1], fileno(stdout));
+        if (ret < 0) return OMPI_ERROR;
+    } else {
+        if(opts->p_stdout[1] != fileno(stdout)) {
+            dup2(opts->p_stdout[1], fileno(stdout));
+            if (ret < 0) return OMPI_ERROR;
+            close(opts->p_stdout[1]); 
+        }
+        if(opts->p_stdin[1] != fileno(stdin)) {
+            dup2(opts->p_stdin[1], fileno(stdin));
+            if (ret < 0) return OMPI_ERROR;
+            close(opts->p_stdin[1]); 
+        }
+    }
+    if(opts->p_stderr[1] != fileno(stderr)) {
+        dup2(opts->p_stderr[1], fileno(stderr));
+        if (ret < 0) return OMPI_ERROR;
+        close(opts->p_stderr[1]);
+    }
+
+    return OMPI_SUCCESS;
+}
+
+
+int
+iof_base_setup_parent(const orte_process_name_t* name,
+                      mca_iof_base_io_conf_t *opts)
+{
+    int ret;
+
+    if (! opts->usepty) {
+        close(opts->p_stdout[1]);
+        close(opts->p_stdin[1]);
+    }
+    close(opts->p_stderr[1]);
+
+    /* connect read end to IOF */
+    ret = orte_iof.iof_publish(name, ORTE_IOF_SOURCE,
+                              ORTE_IOF_STDOUT, opts->p_stdout[0]);
+    if(ORTE_SUCCESS != ret) {
+        ORTE_ERROR_LOG(ret);
+        return ret;
+    }
+
+    ret = orte_iof.iof_publish(name, ORTE_IOF_SOURCE, 
+                              ORTE_IOF_STDERR, opts->p_stderr[0]);
+    if(ORTE_SUCCESS != ret) {
+        ORTE_ERROR_LOG(ret);
+        return ret;
+    }
+
+    return OMPI_SUCCESS;
+}

src/mca/iof/base/iof_base_setup.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#ifndef IOF_BASE_SETUP_H_
+#define IOF_BASE_SETUP_H_
+
+#include "mca/ns/ns.h"
+
+struct mca_iof_base_io_conf_t {
+    int p_stdin[2];
+    int p_stdout[2];
+    int p_stderr[2];
+
+    int usepty;
+};
+typedef struct mca_iof_base_io_conf_t mca_iof_base_io_conf_t;
+
+
+/**
+ * Do pre-fork IOF setup tasks
+ *
+ * Do all stdio forwarding that must be done before fork() is called.
+ * This might include creating pipes or ptys or similar work.
+ */
+int iof_base_setup_prefork(mca_iof_base_io_conf_t *opts);
+
+int iof_base_setup_child(mca_iof_base_io_conf_t *opts);
+
+int iof_base_setup_parent(const orte_process_name_t* name,
+                          mca_iof_base_io_conf_t *opts);
+
+#endif