ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Ensure IOF tags are properly assigned to sinks and read events

Просмотр исходного кода 
This commit was SVN r20068.
Этот коммит содержится в:
Ralph Castain 2008-12-04 01:09:20 +00:00
родитель 06097db928
Коммит ec930d14a9
3 изменённых файлов: 30 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
orte/mca/iof/hnp/iof_hnp.c
Просмотреть файл

@ -137,13 +137,13 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
SETUP: SETUP:
/* define a read event and activate it */ /* define a read event and activate it */
if (src_tag & ORTE_IOF_STDOUT) { if (src_tag & ORTE_IOF_STDOUT) {
ORTE_IOF_READ_EVENT(&proct->revstdout, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstdout, dst_name, fd, ORTE_IOF_STDOUT,
orte_iof_hnp_read_local_handler, true); orte_iof_hnp_read_local_handler, true);
} else if (src_tag & ORTE_IOF_STDERR) { } else if (src_tag & ORTE_IOF_STDERR) {
ORTE_IOF_READ_EVENT(&proct->revstderr, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstderr, dst_name, fd, ORTE_IOF_STDERR,
orte_iof_hnp_read_local_handler, true); orte_iof_hnp_read_local_handler, true);
} else if (src_tag & ORTE_IOF_STDDIAG) { } else if (src_tag & ORTE_IOF_STDDIAG) {
ORTE_IOF_READ_EVENT(&proct->revstddiag, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstddiag, dst_name, fd, ORTE_IOF_STDDIAG,
orte_iof_hnp_read_local_handler, true); orte_iof_hnp_read_local_handler, true);
} }
return ORTE_SUCCESS; return ORTE_SUCCESS;
@ -154,7 +154,7 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
*/ */
if (ORTE_VPID_WILDCARD == dst_name->vpid) { if (ORTE_VPID_WILDCARD == dst_name->vpid) {
/* if wildcard, define a sink with that info so it gets sent out */ /* if wildcard, define a sink with that info so it gets sent out */
ORTE_IOF_SINK_DEFINE(&sink, dst_name, -1, src_tag, ORTE_IOF_SINK_DEFINE(&sink, dst_name, -1, ORTE_IOF_STDIN,
stdin_write_handler, stdin_write_handler,
&mca_iof_hnp_component.sinks); &mca_iof_hnp_component.sinks);
} else { } else {
@ -166,7 +166,7 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
procs = (orte_proc_t**)jdata->procs->addr; procs = (orte_proc_t**)jdata->procs->addr;
/* if it is me, then don't set this up - we'll get it on the pull */ /* if it is me, then don't set this up - we'll get it on the pull */
if (ORTE_PROC_MY_NAME->vpid != procs[dst_name->vpid]->node->daemon->name.vpid) { if (ORTE_PROC_MY_NAME->vpid != procs[dst_name->vpid]->node->daemon->name.vpid) {
ORTE_IOF_SINK_DEFINE(&sink, dst_name, -1, src_tag, ORTE_IOF_SINK_DEFINE(&sink, dst_name, -1, ORTE_IOF_STDIN,
stdin_write_handler, stdin_write_handler,
&mca_iof_hnp_component.sinks); &mca_iof_hnp_component.sinks);
sink->daemon.jobid = ORTE_PROC_MY_NAME->jobid; sink->daemon.jobid = ORTE_PROC_MY_NAME->jobid;
@ -213,7 +213,7 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
* be dropped upon receipt at the local daemon * be dropped upon receipt at the local daemon
*/ */
ORTE_IOF_READ_EVENT(&mca_iof_hnp_component.stdinev, ORTE_IOF_READ_EVENT(&mca_iof_hnp_component.stdinev,
dst_name, fd, src_tag, dst_name, fd, ORTE_IOF_STDIN,
orte_iof_hnp_read_local_handler, false); orte_iof_hnp_read_local_handler, false);
/* check to see if we want the stdin read event to be /* check to see if we want the stdin read event to be
@ -231,7 +231,7 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
* and activate it * and activate it
*/ */
ORTE_IOF_READ_EVENT(&mca_iof_hnp_component.stdinev, ORTE_IOF_READ_EVENT(&mca_iof_hnp_component.stdinev,
dst_name, fd, src_tag, dst_name, fd, ORTE_IOF_STDIN,
orte_iof_hnp_read_local_handler, true); orte_iof_hnp_read_local_handler, true);
} }
} }
@ -272,7 +272,7 @@ static int hnp_pull(const orte_process_name_t* dst_name,
fcntl(fd, F_SETFL, flags); fcntl(fd, F_SETFL, flags);
} }
ORTE_IOF_SINK_DEFINE(&sink, dst_name, fd, src_tag, ORTE_IOF_SINK_DEFINE(&sink, dst_name, fd, ORTE_IOF_STDIN,
stdin_write_handler, stdin_write_handler,
&mca_iof_hnp_component.sinks); &mca_iof_hnp_component.sinks);
sink->daemon.jobid = ORTE_PROC_MY_NAME->jobid; sink->daemon.jobid = ORTE_PROC_MY_NAME->jobid;

23
orte/mca/iof/hnp/iof_hnp_receive.c
Просмотреть файл

@ -95,11 +95,24 @@ static void process_msg(int fd, short event, void *cbdata)
/* a tool is requesting that we send it a copy of the specified stream(s) /* a tool is requesting that we send it a copy of the specified stream(s)
* from the specified process(es), so create a sink for it * from the specified process(es), so create a sink for it
*/ */
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, stream, if (ORTE_IOF_STDOUT & stream) {
NULL, &mca_iof_hnp_component.sinks); ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDOUT,
/* specify the name of the tool that wants this data */ NULL, &mca_iof_hnp_component.sinks);
sink->daemon.jobid = mev->sender.jobid; sink->daemon.jobid = mev->sender.jobid;
sink->daemon.vpid = mev->sender.vpid; sink->daemon.vpid = mev->sender.vpid;
}
if (ORTE_IOF_STDERR & stream) {
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDERR,
NULL, &mca_iof_hnp_component.sinks);
sink->daemon.jobid = mev->sender.jobid;
sink->daemon.vpid = mev->sender.vpid;
}
if (ORTE_IOF_STDDIAG & stream) {
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDDIAG,
NULL, &mca_iof_hnp_component.sinks);
sink->daemon.jobid = mev->sender.jobid;
sink->daemon.vpid = mev->sender.vpid;
}
goto CLEAN_RETURN; goto CLEAN_RETURN;
} }

8
orte/mca/iof/orted/iof_orted.c
Просмотреть файл

@ -123,13 +123,13 @@ static int orted_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_ta
SETUP: SETUP:
/* define a read event and activate it */ /* define a read event and activate it */
if (src_tag & ORTE_IOF_STDOUT) { if (src_tag & ORTE_IOF_STDOUT) {
ORTE_IOF_READ_EVENT(&proct->revstdout, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstdout, dst_name, fd, ORTE_IOF_STDOUT,
orte_iof_orted_read_handler, true); orte_iof_orted_read_handler, true);
} else if (src_tag & ORTE_IOF_STDERR) { } else if (src_tag & ORTE_IOF_STDERR) {
ORTE_IOF_READ_EVENT(&proct->revstderr, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstderr, dst_name, fd, ORTE_IOF_STDERR,
orte_iof_orted_read_handler, true); orte_iof_orted_read_handler, true);
} else if (src_tag & ORTE_IOF_STDDIAG) { } else if (src_tag & ORTE_IOF_STDDIAG) {
ORTE_IOF_READ_EVENT(&proct->revstddiag, dst_name, fd, src_tag, ORTE_IOF_READ_EVENT(&proct->revstddiag, dst_name, fd, ORTE_IOF_STDDIAG,
orte_iof_orted_read_handler, true); orte_iof_orted_read_handler, true);
} }
@ -169,7 +169,7 @@ static int orted_pull(const orte_process_name_t* dst_name,
fcntl(fd, F_SETFL, flags); fcntl(fd, F_SETFL, flags);
} }
ORTE_IOF_SINK_DEFINE(&sink, dst_name, fd, src_tag, ORTE_IOF_SINK_DEFINE(&sink, dst_name, fd, ORTE_IOF_STDIN,
stdin_write_handler, stdin_write_handler,
&mca_iof_orted_component.sinks); &mca_iof_orted_component.sinks);