Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
|
|
|
* University Research and Technology
|
|
|
|
* Corporation. All rights reserved.
|
2008-11-01 03:39:46 +03:00
|
|
|
* Copyright (c) 2004-2008 The University of Tennessee and The University
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
* 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.
|
2009-01-11 05:30:00 +03:00
|
|
|
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
* $COPYRIGHT$
|
|
|
|
*
|
|
|
|
* Additional copyrights may follow
|
|
|
|
*
|
|
|
|
* $HEADER$
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "orte_config.h"
|
|
|
|
#include "orte/constants.h"
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif /* HAVE_STRING_H */
|
|
|
|
|
2008-12-10 23:40:47 +03:00
|
|
|
#include "opal/dss/dss.h"
|
2008-12-09 20:11:59 +03:00
|
|
|
|
2008-12-10 23:40:47 +03:00
|
|
|
#include "orte/util/show_help.h"
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
#include "orte/mca/rml/rml.h"
|
|
|
|
#include "orte/mca/errmgr/errmgr.h"
|
2008-12-10 23:40:47 +03:00
|
|
|
#include "orte/mca/odls/odls_types.h"
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
#include "orte/util/name_fns.h"
|
|
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "orte/mca/ess/ess.h"
|
2008-12-10 23:40:47 +03:00
|
|
|
#include "orte/orted/orted.h"
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
|
|
|
|
#include "orte/mca/iof/iof.h"
|
|
|
|
#include "orte/mca/iof/base/base.h"
|
|
|
|
|
|
|
|
#include "iof_hnp.h"
|
|
|
|
|
2008-12-10 23:40:47 +03:00
|
|
|
static void restart_stdin(int fd, short event, void *cbdata)
|
|
|
|
{
|
|
|
|
if (NULL != mca_iof_hnp_component.stdinev) {
|
2009-01-12 23:12:58 +03:00
|
|
|
mca_iof_hnp_component.stdinev->active = true;
|
2008-12-10 23:40:47 +03:00
|
|
|
opal_event_add(&(mca_iof_hnp_component.stdinev->ev), 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
/* return true if we should read stdin from fd, false otherwise */
|
|
|
|
bool orte_iof_hnp_stdin_check(int fd)
|
|
|
|
{
|
|
|
|
#if !defined(__WINDOWS__) && defined(HAVE_TCGETPGRP)
|
|
|
|
if( isatty(fd) && (getpgrp() != tcgetpgrp(fd)) ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif /* !defined(__WINDOWS__) */
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void orte_iof_hnp_stdin_cb(int fd, short event, void *cbdata)
|
|
|
|
{
|
|
|
|
bool should_process = orte_iof_hnp_stdin_check(0);
|
|
|
|
|
|
|
|
if (should_process) {
|
|
|
|
mca_iof_hnp_component.stdinev->active = true;
|
|
|
|
opal_event_add(&(mca_iof_hnp_component.stdinev->ev), 0);
|
|
|
|
} else {
|
|
|
|
opal_event_del(&(mca_iof_hnp_component.stdinev->ev));
|
|
|
|
mca_iof_hnp_component.stdinev->active = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this is the read handler for my own child procs. In this case,
|
|
|
|
* the data is going nowhere - I just output it myself
|
|
|
|
*/
|
|
|
|
void orte_iof_hnp_read_local_handler(int fd, short event, void *cbdata)
|
|
|
|
{
|
|
|
|
orte_iof_read_event_t *rev = (orte_iof_read_event_t*)cbdata;
|
|
|
|
unsigned char data[ORTE_IOF_BASE_MSG_MAX];
|
|
|
|
int32_t numbytes;
|
|
|
|
opal_list_item_t *item;
|
2008-12-10 23:40:47 +03:00
|
|
|
orte_iof_proc_t *proct;
|
|
|
|
int rc;
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
|
|
|
|
OPAL_THREAD_LOCK(&mca_iof_hnp_component.lock);
|
|
|
|
|
|
|
|
/* read up to the fragment size */
|
|
|
|
#if !defined(__WINDOWS__)
|
|
|
|
numbytes = read(fd, data, sizeof(data));
|
|
|
|
#else
|
|
|
|
{
|
|
|
|
DWORD readed;
|
|
|
|
HANDLE handle = (HANDLE)_get_osfhandle(fd);
|
|
|
|
ReadFile(handle, data, sizeof(data), &readed, NULL);
|
|
|
|
numbytes = (int)readed;
|
|
|
|
}
|
|
|
|
#endif /* !defined(__WINDOWS__) */
|
|
|
|
|
|
|
|
if (numbytes < 0) {
|
|
|
|
/* either we have a connection error or it was a non-blocking read */
|
|
|
|
|
|
|
|
/* non-blocking, retry */
|
|
|
|
if (EAGAIN == errno || EINTR == errno) {
|
2008-12-10 23:40:47 +03:00
|
|
|
opal_event_add(&rev->ev, 0);
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_iof_hnp_component.lock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
|
|
|
"%s iof:hnp:read handler %s Error on connection:%d",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
ORTE_NAME_PRINT(&rev->name), fd));
|
2008-11-01 01:23:53 +03:00
|
|
|
/* Un-recoverable error. Allow the code to flow as usual in order to
|
|
|
|
* to send the zero bytes message up the stream, and then close the
|
|
|
|
* file descriptor and delete the event.
|
|
|
|
*/
|
|
|
|
numbytes = 0;
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* is this read from our stdin? */
|
|
|
|
if (ORTE_IOF_STDIN & rev->tag) {
|
|
|
|
/* cycle through our list of sinks */
|
|
|
|
for (item = opal_list_get_first(&mca_iof_hnp_component.sinks);
|
|
|
|
item != opal_list_get_end(&mca_iof_hnp_component.sinks);
|
|
|
|
item = opal_list_get_next(item)) {
|
|
|
|
orte_iof_sink_t* sink = (orte_iof_sink_t*)item;
|
|
|
|
|
|
|
|
/* only look at stdin sinks */
|
|
|
|
if (!(ORTE_IOF_STDIN & sink->tag)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if the daemon is me, then this is a local sink */
|
|
|
|
if (ORTE_PROC_MY_NAME->jobid == sink->daemon.jobid &&
|
|
|
|
ORTE_PROC_MY_NAME->vpid == sink->daemon.vpid) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
|
|
|
"%s read %d bytes from stdin - writing to %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), numbytes,
|
|
|
|
ORTE_NAME_PRINT(&rev->name)));
|
2008-10-23 23:11:05 +04:00
|
|
|
/* send the bytes down the pipe - we even send 0 byte events
|
|
|
|
* down the pipe so it forces out any preceding data before
|
|
|
|
* closing the output stream
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
*/
|
2008-12-10 23:40:47 +03:00
|
|
|
if (NULL != sink->wev) {
|
|
|
|
if (ORTE_IOF_MAX_INPUT_BUFFERS < orte_iof_base_write_output(&rev->name, rev->tag, data, numbytes, sink->wev)) {
|
|
|
|
/* getting too backed up - stop the read event for now if it is still active */
|
|
|
|
if (mca_iof_hnp_component.stdinev->active) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
|
|
|
"buffer backed up - holding"));
|
|
|
|
opal_event_del(&(mca_iof_hnp_component.stdinev->ev));
|
|
|
|
mca_iof_hnp_component.stdinev->active = false;
|
|
|
|
}
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
2008-12-10 23:40:47 +03:00
|
|
|
"%s sending %d bytes from stdin to daemon %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), numbytes,
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
ORTE_NAME_PRINT(&sink->daemon)));
|
|
|
|
|
|
|
|
/* send the data to the daemon so it can
|
|
|
|
* write it to the proc's fd - in this case,
|
|
|
|
* we pass sink->name to indicate who is to
|
|
|
|
* receive the data. If the connection closed,
|
|
|
|
* numbytes will be zero so zero bytes will be
|
|
|
|
* sent - this will tell the daemon to close
|
|
|
|
* the fd for stdin to that proc
|
|
|
|
*/
|
|
|
|
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &sink->name, ORTE_IOF_STDIN, data, numbytes);
|
|
|
|
}
|
|
|
|
}
|
2008-12-10 23:40:47 +03:00
|
|
|
/* if num_bytes was zero, then we need to terminate the event */
|
|
|
|
if (0 == numbytes) {
|
|
|
|
/* this will also close our stdin file descriptor */
|
|
|
|
OBJ_RELEASE(mca_iof_hnp_component.stdinev);
|
|
|
|
} else {
|
2009-01-12 23:12:58 +03:00
|
|
|
/* if we are looking at a tty, then we just go ahead and restart the
|
|
|
|
* read event assuming we are not backgrounded
|
|
|
|
*/
|
|
|
|
if (orte_iof_hnp_stdin_check(fd)) {
|
|
|
|
restart_stdin(fd, 0, NULL);
|
|
|
|
} else {
|
|
|
|
/* delay for awhile and then restart */
|
|
|
|
ORTE_TIMER_EVENT(0, 10000, restart_stdin);
|
|
|
|
}
|
2008-12-10 23:40:47 +03:00
|
|
|
}
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
/* nothing more to do */
|
2008-12-10 23:40:47 +03:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_iof_hnp_component.lock);
|
|
|
|
/* since the event is persistent, we do not need to re-add it */
|
|
|
|
return;
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this must be output from one of my local procs - see
|
|
|
|
* if anyone else has requested a copy of this info
|
|
|
|
*/
|
|
|
|
for (item = opal_list_get_first(&mca_iof_hnp_component.sinks);
|
|
|
|
item != opal_list_get_end(&mca_iof_hnp_component.sinks);
|
|
|
|
item = opal_list_get_next(item)) {
|
|
|
|
orte_iof_sink_t *sink = (orte_iof_sink_t*)item;
|
|
|
|
if (sink->tag & rev->tag &&
|
|
|
|
sink->name.jobid == rev->name.jobid &&
|
|
|
|
(ORTE_VPID_WILDCARD == sink->name.vpid || sink->name.vpid == rev->name.vpid)) {
|
|
|
|
/* need to send the data to the remote endpoint - if
|
|
|
|
* the connection closed, numbytes will be zero, so
|
|
|
|
* the remote endpoint will know to close its local fd.
|
|
|
|
* In this case, we pass rev->name to indicate who the
|
|
|
|
* data came from.
|
|
|
|
*/
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
|
|
|
"%s sending data to tool %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
ORTE_NAME_PRINT(&sink->daemon)));
|
|
|
|
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &rev->name, rev->tag, data, numbytes);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_iof_base.iof_output,
|
|
|
|
"%s read %d bytes from %s of %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), numbytes,
|
|
|
|
(ORTE_IOF_STDOUT & rev->tag) ? "stdout" : ((ORTE_IOF_STDERR & rev->tag) ? "stderr" : "stddiag"),
|
|
|
|
ORTE_NAME_PRINT(&rev->name)));
|
|
|
|
|
2008-12-10 23:40:47 +03:00
|
|
|
if (0 == numbytes) {
|
|
|
|
/* if we read 0 bytes from the stdout/err/diag, there is
|
|
|
|
* nothing to output - find this proc on our list and
|
|
|
|
* release the appropriate event. This will delete the
|
|
|
|
* read event and close the file descriptor
|
|
|
|
*/
|
|
|
|
for (item = opal_list_get_first(&mca_iof_hnp_component.procs);
|
|
|
|
item != opal_list_get_end(&mca_iof_hnp_component.procs);
|
|
|
|
item = opal_list_get_next(item)) {
|
|
|
|
proct = (orte_iof_proc_t*)item;
|
|
|
|
if (proct->name.jobid == rev->name.jobid &&
|
|
|
|
proct->name.vpid == rev->name.vpid) {
|
|
|
|
/* found it - release corresponding event. This deletes
|
|
|
|
* the read event and closes the file descriptor
|
|
|
|
*/
|
|
|
|
if (rev->tag & ORTE_IOF_STDOUT) {
|
|
|
|
OBJ_RELEASE(proct->revstdout);
|
|
|
|
} else if (rev->tag & ORTE_IOF_STDERR) {
|
|
|
|
OBJ_RELEASE(proct->revstderr);
|
|
|
|
} else if (rev->tag & ORTE_IOF_STDDIAG) {
|
|
|
|
OBJ_RELEASE(proct->revstddiag);
|
|
|
|
}
|
|
|
|
/* check to see if they are all done */
|
|
|
|
if (NULL == proct->revstdout &&
|
|
|
|
NULL == proct->revstderr &&
|
|
|
|
NULL == proct->revstddiag) {
|
|
|
|
opal_buffer_t cmdbuf;
|
|
|
|
orte_daemon_cmd_flag_t command;
|
|
|
|
/* this proc's iof is complete */
|
|
|
|
opal_list_remove_item(&mca_iof_hnp_component.procs, item);
|
|
|
|
/* setup a cmd to notify that the iof is complete */
|
|
|
|
OBJ_CONSTRUCT(&cmdbuf, opal_buffer_t);
|
|
|
|
command = ORTE_DAEMON_IOF_COMPLETE;
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmdbuf, &command, 1, ORTE_DAEMON_CMD))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto CLEANUP;
|
|
|
|
}
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmdbuf, &proct->name, 1, ORTE_NAME))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto CLEANUP;
|
|
|
|
}
|
|
|
|
ORTE_MESSAGE_EVENT(ORTE_PROC_MY_NAME, &cmdbuf, ORTE_RML_TAG_DAEMON, orte_daemon_cmd_processor);
|
|
|
|
CLEANUP:
|
|
|
|
OBJ_DESTRUCT(&cmdbuf);
|
|
|
|
OBJ_RELEASE(proct);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
2008-11-03 17:03:08 +03:00
|
|
|
if (ORTE_IOF_STDOUT & rev->tag) {
|
|
|
|
orte_iof_base_write_output(&rev->name, rev->tag, data, numbytes, &orte_iof_base.iof_write_stdout);
|
|
|
|
} else {
|
|
|
|
orte_iof_base_write_output(&rev->name, rev->tag, data, numbytes, &orte_iof_base.iof_write_stderr);
|
|
|
|
|
|
|
|
}
|
2008-12-10 23:40:47 +03:00
|
|
|
/* re-add the event */
|
|
|
|
opal_event_add(&rev->ev, 0);
|
2008-11-14 23:22:36 +03:00
|
|
|
}
|
|
|
|
|
2008-11-01 01:23:53 +03:00
|
|
|
OPAL_THREAD_UNLOCK(&mca_iof_hnp_component.lock);
|
Roll in the revamped IOF subsystem. Per the devel mailing list email, this is a complete rewrite of the iof framework designed to simplify the code for maintainability, and to support features we had planned to do, but were too difficult to implement in the old code. Specifically, the new code:
1. completely and cleanly separates responsibilities between the HNP, orted, and tool components.
2. removes all wireup messaging during launch and shutdown.
3. maintains flow control for stdin to avoid large-scale consumption of memory by orteds when large input files are forwarded. This is done using an xon/xoff protocol.
4. enables specification of stdin recipients on the mpirun cmd line. Allowed options include rank, "all", or "none". Default is rank 0.
5. creates a new MPI_Info key "ompi_stdin_target" that supports the above options for child jobs. Default is "none".
6. adds a new tool "orte-iof" that can connect to a running mpirun and display the output. Cmd line options allow selection of any combination of stdout, stderr, and stddiag. Default is stdout.
7. adds a new mpirun and orte-iof cmd line option "tag-output" that will tag each line of output with process name and stream ident. For example, "[1,0]<stdout>this is output"
This is not intended for the 1.3 release as it is a major change requiring considerable soak time.
This commit was SVN r19767.
2008-10-18 04:00:49 +04:00
|
|
|
return;
|
|
|
|
}
|