728a24c8ec
Basically, the remaining problem turned out to be: 1. closing stdout/stderr during orte_finalize of mpirun 2. inadvertently setting up a write event on fd = -1 3. devising a scheme to more accurately track when the stdin write event was active vs closed so it only got released once This passed prelim MTT testing by Jeff and Tim, but should soak for awhile before migrating to 1.3. This commit was SVN r20106. The following SVN revision numbers were found above: r20064 --> open-mpi/ompi@a07660aea8 r20068 --> open-mpi/ompi@ec930d14a9 r20074 --> open-mpi/ompi@2940309613
218 строки
7.0 KiB
C
218 строки
7.0 KiB
C
/*
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. 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$
|
|
*/
|
|
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/constants.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
|
|
#include "orte/util/show_help.h"
|
|
#include "orte/util/proc_info.h"
|
|
#include "orte/runtime/orte_globals.h"
|
|
#include "orte/util/name_fns.h"
|
|
|
|
#include "orte/mca/iof/iof.h"
|
|
#include "orte/mca/iof/base/base.h"
|
|
|
|
/*
|
|
* The following file was created by configure. It contains extern
|
|
* statements and the definition of an array of pointers to each
|
|
* component's public orte_base_component_t struct.
|
|
*/
|
|
|
|
#include "orte/mca/iof/base/static-components.h"
|
|
|
|
orte_iof_base_module_t orte_iof;
|
|
|
|
|
|
#if ORTE_DISABLE_FULL_SUPPORT
|
|
/* have to include a bogus function here so that
|
|
* the build system sees at least one function
|
|
* in the library
|
|
*/
|
|
int orte_iof_base_open(void)
|
|
{
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
#else
|
|
|
|
/* class instances */
|
|
static void orte_iof_base_proc_construct(orte_iof_proc_t* ptr)
|
|
{
|
|
ptr->revstdout = NULL;
|
|
ptr->revstderr = NULL;
|
|
ptr->revstddiag = NULL;
|
|
}
|
|
static void orte_iof_base_proc_destruct(orte_iof_proc_t* ptr)
|
|
{
|
|
if (NULL != ptr->revstdout) {
|
|
OBJ_RELEASE(ptr->revstdout);
|
|
}
|
|
if (NULL != ptr->revstderr) {
|
|
OBJ_RELEASE(ptr->revstderr);
|
|
}
|
|
if (NULL != ptr->revstddiag) {
|
|
OBJ_RELEASE(ptr->revstddiag);
|
|
}
|
|
}
|
|
OBJ_CLASS_INSTANCE(orte_iof_proc_t,
|
|
opal_list_item_t,
|
|
orte_iof_base_proc_construct,
|
|
orte_iof_base_proc_destruct);
|
|
|
|
|
|
static void orte_iof_base_sink_construct(orte_iof_sink_t* ptr)
|
|
{
|
|
ptr->wev = OBJ_NEW(orte_iof_write_event_t);
|
|
}
|
|
static void orte_iof_base_sink_destruct(orte_iof_sink_t* ptr)
|
|
{
|
|
OPAL_OUTPUT_VERBOSE((20, orte_iof_base.iof_output,
|
|
"%s iof: closing sink for process %s",
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
ORTE_NAME_PRINT(&ptr->name)));
|
|
if (NULL != ptr->wev) {
|
|
OBJ_RELEASE(ptr->wev);
|
|
}
|
|
}
|
|
OBJ_CLASS_INSTANCE(orte_iof_sink_t,
|
|
opal_list_item_t,
|
|
orte_iof_base_sink_construct,
|
|
orte_iof_base_sink_destruct);
|
|
|
|
|
|
static void orte_iof_base_read_event_construct(orte_iof_read_event_t* rev)
|
|
{
|
|
memset(&rev->ev,0,sizeof(rev->ev));
|
|
}
|
|
static void orte_iof_base_read_event_destruct(orte_iof_read_event_t* rev)
|
|
{
|
|
opal_event_del(&rev->ev);
|
|
if (0 <= rev->ev.ev_fd) {
|
|
OPAL_OUTPUT_VERBOSE((20, orte_iof_base.iof_output,
|
|
"%s iof: closing fd %d for process %s",
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
rev->ev.ev_fd, ORTE_NAME_PRINT(&rev->name)));
|
|
close(rev->ev.ev_fd);
|
|
}
|
|
}
|
|
OBJ_CLASS_INSTANCE(orte_iof_read_event_t,
|
|
opal_object_t,
|
|
orte_iof_base_read_event_construct,
|
|
orte_iof_base_read_event_destruct);
|
|
|
|
static void orte_iof_base_write_event_construct(orte_iof_write_event_t* wev)
|
|
{
|
|
wev->pending = false;
|
|
wev->fd = -1;
|
|
OBJ_CONSTRUCT(&wev->outputs, opal_list_t);
|
|
}
|
|
static void orte_iof_base_write_event_destruct(orte_iof_write_event_t* wev)
|
|
{
|
|
if (wev->pending) {
|
|
opal_event_del(&wev->ev);
|
|
}
|
|
if (2 < wev->fd) {
|
|
OPAL_OUTPUT_VERBOSE((20, orte_iof_base.iof_output,
|
|
"%s iof: closing fd %d for write event",
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), wev->fd));
|
|
close(wev->fd);
|
|
}
|
|
OBJ_DESTRUCT(&wev->outputs);
|
|
}
|
|
OBJ_CLASS_INSTANCE(orte_iof_write_event_t,
|
|
opal_list_item_t,
|
|
orte_iof_base_write_event_construct,
|
|
orte_iof_base_write_event_destruct);
|
|
|
|
OBJ_CLASS_INSTANCE(orte_iof_write_output_t,
|
|
opal_list_item_t,
|
|
NULL, NULL);
|
|
|
|
/*
|
|
* Global variables
|
|
*/
|
|
|
|
orte_iof_base_t orte_iof_base;
|
|
|
|
|
|
/**
|
|
* Function for finding and opening either all MCA components, or the one
|
|
* that was specifically requested via a MCA parameter.
|
|
*/
|
|
int orte_iof_base_open(void)
|
|
{
|
|
/* Initialize globals */
|
|
OBJ_CONSTRUCT(&orte_iof_base.iof_components_opened, opal_list_t);
|
|
OBJ_CONSTRUCT(&orte_iof_base.iof_write_output_lock, opal_mutex_t);
|
|
|
|
/* daemons do not need to do this as they do not write out stdout/err */
|
|
if (!orte_process_info.daemon) {
|
|
/* setup the stdout event */
|
|
OBJ_CONSTRUCT(&orte_iof_base.iof_write_stdout, orte_iof_write_event_t);
|
|
orte_iof_base.iof_write_stdout.fd = 1;
|
|
/* create the write event, but don't add it until we need it */
|
|
opal_event_set(&orte_iof_base.iof_write_stdout.ev,
|
|
orte_iof_base.iof_write_stdout.fd,
|
|
OPAL_EV_WRITE,
|
|
orte_iof_base_write_handler,
|
|
&orte_iof_base.iof_write_stdout);
|
|
|
|
/* setup the stderr event */
|
|
OBJ_CONSTRUCT(&orte_iof_base.iof_write_stderr, orte_iof_write_event_t);
|
|
orte_iof_base.iof_write_stderr.fd = 2;
|
|
/* create the write event, but don't add it until we need it */
|
|
opal_event_set(&orte_iof_base.iof_write_stderr.ev,
|
|
orte_iof_base.iof_write_stderr.fd,
|
|
OPAL_EV_WRITE,
|
|
orte_iof_base_write_handler,
|
|
&orte_iof_base.iof_write_stderr);
|
|
/* do NOT set these file descriptors to non-blocking. If we do so,
|
|
* we set the file descriptor to non-blocking for everyone that has
|
|
* that file descriptor, which includes everyone else in our shell
|
|
* pipeline chain. (See
|
|
* http://lists.freebsd.org/pipermail/freebsd-hackers/2005-January/009742.html).
|
|
* This causes things like "mpirun -np 1 big_app | cat" to lose
|
|
* output, because cat's stdout is then ALSO non-blocking and cat
|
|
* isn't built to deal with that case (same with almost all other
|
|
* unix text utils).
|
|
*/
|
|
}
|
|
|
|
orte_iof_base.iof_output = opal_output_open(NULL);
|
|
|
|
/* Open up all available components */
|
|
if (ORTE_SUCCESS !=
|
|
mca_base_components_open("iof", orte_iof_base.iof_output,
|
|
mca_iof_base_static_components,
|
|
&orte_iof_base.iof_components_opened,
|
|
true)) {
|
|
return ORTE_ERROR;
|
|
}
|
|
|
|
/* All done */
|
|
return ORTE_SUCCESS;
|
|
}
|
|
#endif
|