November 2012 - commits - mailman3.cels.anl.gov

r10701 - in mpich2/trunk/src/pm/hydra: tools/demux ui/mpich
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 02:50:40 -0600 (Fri, 30 Nov 2012) New Revision: 10701 Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c Log: Check for STDIN validity before any other sockets are opened. This is to cover the case where an external script closed STDIN before calling mpiexec. No reviewer. Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 08:50:33 UTC (rev 10700) +++ mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 08:50:40 UTC (rev 10701) @@ -12,6 +12,7 @@ struct HYDT_dmxu_fns HYDT_dmxu_fns = { 0 }; static int got_sigttin = 0; +static int stdin_valid; #if defined(SIGTTIN) static void signal_cb(int sig) @@ -63,6 +64,9 @@ "cannot find an appropriate demux engine\n"); } + status = HYDT_dmxu_fns.stdin_valid(&stdin_valid); + HYDU_ERR_POP(status, "error checking for stdin validity\n"); + fn_exit: HYDU_FUNC_EXIT(); return status; @@ -277,5 +281,7 @@ HYD_status HYDT_dmx_stdin_valid(int *out) { - return HYDT_dmxu_fns.stdin_valid(out); + *out = stdin_valid; + + return HYD_SUCCESS; } Modified: mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c =================================================================== --- mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2012-11-30 08:50:33 UTC (rev 10700) +++ mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2012-11-30 08:50:40 UTC (rev 10701) @@ -144,18 +144,13 @@ status = HYDU_set_common_signals(signal_cb); HYDU_ERR_POP(status, "unable to set signal\n"); - if (pipe(HYD_server_info.cmd_pipe) < 0) - HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "pipe error\n"); - status = HYDT_ftb_init(); HYDU_ERR_POP(status, "unable to initialize FTB\n"); - /* Get user preferences */ status = HYD_uii_mpx_get_parameters(argv); HYDU_ERR_POP(status, "error parsing parameters\n"); - /* Now we initialize engines that require us to know user * preferences */ #if HAVE_ALARM @@ -163,6 +158,10 @@ alarm(HYD_ui_mpich_info.ckpoint_int); #endif /* HAVE_ALARM */ + /* The demux engine should be initialized before any sockets are + * created, since it checks for STDIN's validity. If STDIN was + * closed and we opened a socket that got the same fd as STDIN, + * this test will not be possible. */ status = HYDT_dmx_init(&HYD_server_info.user_global.demux); HYDU_ERR_POP(status, "unable to initialize the demux engine\n"); @@ -318,6 +317,10 @@ HYD_server_info.stdout_cb = HYD_uiu_stdout_cb; HYD_server_info.stderr_cb = HYD_uiu_stderr_cb; + /* Create a pipe connection to wake up the process manager */ + if (pipe(HYD_server_info.cmd_pipe) < 0) + HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "pipe error\n"); + /* Launch the processes */ status = HYD_pmci_launch_procs(); HYDU_ERR_POP(status, "process manager returned error launching processes\n");

1 0

r10700 - mpich2/trunk/src/pm/hydra/tools/demux
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 02:50:33 -0600 (Fri, 30 Nov 2012) New Revision: 10700 Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c Log: Whether mpiexec is attached to a terminal does not make any difference for our stdin strategy. Remove that test. No reviewer. Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 07:49:00 UTC (rev 10699) +++ mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 08:50:33 UTC (rev 10700) @@ -13,7 +13,7 @@ static int got_sigttin = 0; -#if defined(SIGTTIN) && defined(HAVE_ISATTY) +#if defined(SIGTTIN) static void signal_cb(int sig) { HYDU_FUNC_ENTER(); @@ -25,7 +25,7 @@ HYDU_FUNC_EXIT(); return; } -#endif /* SIGTTIN and HAVE_ISATTY */ +#endif /* SIGTTIN */ HYD_status HYDT_dmx_init(char **demux) { @@ -228,25 +228,44 @@ * that, we catch SIGTTIN and ignore it. But that causes the * read() call to return an error (with errno == EINTR) when we * are not attached to the terminal. */ -#if defined(SIGTTIN) && defined(HAVE_ISATTY) - if (isatty(STDIN_FILENO)) { - status = HYDU_set_signal(SIGTTIN, signal_cb); - HYDU_ERR_POP(status, "unable to set SIGTTIN\n"); - } -#endif /* SIGTTIN and HAVE_ISATTY */ + /* + * We need to allow for the following cases: + * + * 1. mpiexec -n 2 ./foo --> type something on the terminal + * Attached to terminal, and can read from stdin + * + * 2. mpiexec -n 2 ./foo & + * Attached to terminal, but cannot read from stdin + * + * 3. mpiexec -n 2 ./foo < bar + * Not attached to terminal, but can read from stdin + * + * 4. mpiexec -n 2 ./foo < /dev/null + * Not attached to terminal, and can read from stdin + * + * 5. mpiexec -n 2 ./foo < bar & + * Not attached to terminal, but can read from stdin + * + * 6. mpiexec -n 2 ./foo < /dev/null & + * Not attached to terminal, and can read from stdin + */ + +#if defined(SIGTTIN) + status = HYDU_set_signal(SIGTTIN, signal_cb); + HYDU_ERR_POP(status, "unable to set SIGTTIN\n"); +#endif /* SIGTTIN */ + ret = read(STDIN_FILENO, NULL, 0); - if (ret < 0 && errno == EINTR && got_sigttin) + if (ret == 0) + *out = 1; + else *out = 0; - else - *out = 1; -#if defined(SIGTTIN) && defined(HAVE_ISATTY) - if (isatty(STDIN_FILENO)) { - status = HYDU_set_signal(SIGTTIN, SIG_IGN); - HYDU_ERR_POP(status, "unable to set SIGTTIN\n"); - } -#endif /* SIGTTIN and HAVE_ISATTY */ +#if defined(SIGTTIN) + status = HYDU_set_signal(SIGTTIN, SIG_IGN); + HYDU_ERR_POP(status, "unable to set SIGTTIN\n"); +#endif /* SIGTTIN */ fn_exit: HYDU_FUNC_EXIT();

1 0

r10699 - mpich2/trunk/src/pm/hydra/tools/demux
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:49:00 -0600 (Fri, 30 Nov 2012) New Revision: 10699 Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c Log: Improve the check for a valid stdin. No reviewer. Modified: mpich2/trunk/src/pm/hydra/tools/demux/demux.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 07:48:57 UTC (rev 10698) +++ mpich2/trunk/src/pm/hydra/tools/demux/demux.c 2012-11-30 07:49:00 UTC (rev 10699) @@ -235,19 +235,7 @@ } #endif /* SIGTTIN and HAVE_ISATTY */ - /* FIXME: The below read() check for STDIN validity is somehow - * interfering in the case where the application is run in the - * background, but expects some STDIN. The correct behavior is to - * close the STDIN socket for the application in that - * case. However, this seems to hang. I'm still investigating this - * case. In the meanwhile, I have commented out this check. PLEASE - * DO NOT DELETE. All other cases dealing with STDIN seem to be - * working correctly. */ -#if 0 ret = read(STDIN_FILENO, NULL, 0); -#else - ret = 0; -#endif if (ret < 0 && errno == EINTR && got_sigttin) *out = 0; else

1 0

r10698 - in mpich2/trunk/src/pm/hydra: include pm/pmiserv utils/sock
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:57 -0600 (Fri, 30 Nov 2012) New Revision: 10698 Modified: mpich2/trunk/src/pm/hydra/include/hydra.h mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c mpich2/trunk/src/pm/hydra/utils/sock/sock.c Log: Our stdin handling logic is not correct. I don't see a good way to fix this, unless we add some form of flow-control logic between the proxy and mpiexec. For the time being, at least throw an error when we can't keep up and are giving up, instead of hanging. No reviewer. Modified: mpich2/trunk/src/pm/hydra/include/hydra.h =================================================================== --- mpich2/trunk/src/pm/hydra/include/hydra.h 2012-11-30 07:48:54 UTC (rev 10697) +++ mpich2/trunk/src/pm/hydra/include/hydra.h 2012-11-30 07:48:57 UTC (rev 10698) @@ -535,6 +535,7 @@ enum HYDU_sock_comm_flag flag); HYD_status HYDU_sock_write(int fd, const void *buf, int maxlen, int *sent, int *closed, enum HYDU_sock_comm_flag flag); +HYD_status HYDU_sock_set_nonblock(int fd); HYD_status HYDU_sock_forward_stdio(int in, int out, int *closed); HYD_status HYDU_sock_get_iface_ip(char *iface, char **ip); HYD_status HYDU_sock_is_local(char *host, int *is_local); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:54 UTC (rev 10697) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:57 UTC (rev 10698) @@ -711,6 +711,9 @@ process_id); HYDU_ERR_POP(status, "create process returned error\n"); + status = HYDU_sock_set_nonblock(HYD_pmcd_pmip.downstream.in); + HYDU_ERR_POP(status, "unable to set stdin socket to non-blocking\n"); + HYDU_free_strlist(client_args); if (pmi_fds[1] != HYD_FD_UNSET) { @@ -920,9 +923,6 @@ int count; if (hdr.buflen) { - if (HYD_pmcd_pmip.downstream.in == HYD_FD_CLOSED) - goto fn_exit; - HYDU_MALLOC(buf, char *, hdr.buflen, status); HYDU_ERR_POP(status, "unable to allocate memory\n"); @@ -931,10 +931,20 @@ HYDU_ERR_POP(status, "unable to read from control socket\n"); HYDU_ASSERT(!closed, status); + if (HYD_pmcd_pmip.downstream.in == HYD_FD_CLOSED) { + HYDU_FREE(buf); + goto fn_exit; + } + status = HYDU_sock_write(HYD_pmcd_pmip.downstream.in, buf, hdr.buflen, &count, - &closed, HYDU_SOCK_COMM_MSGWAIT); + &closed, HYDU_SOCK_COMM_NONE); HYDU_ERR_POP(status, "unable to write to downstream stdin\n"); + HYDU_ERR_CHKANDJUMP(status, count != hdr.buflen, HYD_INTERNAL_ERROR, + "process reading stdin too slowly; can't keep up\n"); + + HYDU_ASSERT(count == hdr.buflen, status); + if (HYD_pmcd_pmip.user_global.auto_cleanup) { HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/utils/sock/sock.c =================================================================== --- mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2012-11-30 07:48:54 UTC (rev 10697) +++ mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2012-11-30 07:48:57 UTC (rev 10698) @@ -306,7 +306,7 @@ goto fn_exit; } -static HYD_status set_nonblock(int fd) +HYD_status HYDU_sock_set_nonblock(int fd) { int flags; HYD_status status = HYD_SUCCESS; @@ -343,10 +343,10 @@ (*fwd_hash)->next = NULL; - status = set_nonblock(in); + status = HYDU_sock_set_nonblock(in); HYDU_ERR_POP(status, "unable to set out-socket to non-blocking\n"); - status = set_nonblock(out); + status = HYDU_sock_set_nonblock(out); HYDU_ERR_POP(status, "unable to set out-socket to non-blocking\n"); fn_exit:

1 0

r10697 - in mpich2/trunk/src/pm/hydra: include pm/pmiserv tools/bootstrap/persist tools/nameserver ui/mpich ui/utils utils/args utils/sock
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:54 -0600 (Fri, 30 Nov 2012) New Revision: 10697 Modified: mpich2/trunk/src/pm/hydra/include/hydra.h mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_launch.c mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_server.c mpich2/trunk/src/pm/hydra/tools/nameserver/hydra_nameserver.c mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c mpich2/trunk/src/pm/hydra/ui/utils/uiu.c mpich2/trunk/src/pm/hydra/utils/args/args.c mpich2/trunk/src/pm/hydra/utils/sock/sock.c Log: Update the HYDU_sock_write function to explicitly take a block/no-block parameter. No reviewer. Modified: mpich2/trunk/src/pm/hydra/include/hydra.h =================================================================== --- mpich2/trunk/src/pm/hydra/include/hydra.h 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/include/hydra.h 2012-11-30 07:48:54 UTC (rev 10697) @@ -533,7 +533,8 @@ HYD_status HYDU_sock_accept(int listen_fd, int *fd); HYD_status HYDU_sock_read(int fd, void *buf, int maxlen, int *recvd, int *closed, enum HYDU_sock_comm_flag flag); -HYD_status HYDU_sock_write(int fd, const void *buf, int maxlen, int *sent, int *closed); +HYD_status HYDU_sock_write(int fd, const void *buf, int maxlen, int *sent, int *closed, + enum HYDU_sock_comm_flag flag); HYD_status HYDU_sock_forward_stdio(int in, int out, int *closed); HYD_status HYDU_sock_get_iface_ip(char *iface, char **ip); HYD_status HYDU_sock_is_local(char *host, int *is_local); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -195,7 +195,7 @@ status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &HYD_pmcd_pmip.local.id, sizeof(HYD_pmcd_pmip.local.id), &sent, - &closed); + &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send the proxy ID to the server\n"); if (closed) goto fn_fail; @@ -264,14 +264,15 @@ HYD_pmcd_init_header(&hdr); hdr.cmd = EXIT_STATUS; status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send EXIT_STATUS command upstream\n"); HYDU_ASSERT(!closed, status); status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, HYD_pmcd_pmip.downstream.exit_status, HYD_pmcd_pmip.local.proxy_process_count * sizeof(int), &sent, - &closed); + &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to return exit status upstream\n"); HYDU_ASSERT(!closed, status); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -59,12 +59,12 @@ int upstream_sock_closed; status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, - &upstream_sock_closed); + &upstream_sock_closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "sock write error\n"); HYDU_ASSERT(!upstream_sock_closed, status); status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, recvd, &sent, - &upstream_sock_closed); + &upstream_sock_closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "sock write error\n"); HYDU_ASSERT(!upstream_sock_closed, status); } @@ -281,7 +281,7 @@ hdr.cmd = PROCESS_TERMINATED; hdr.pid = HYD_pmcd_pmip.downstream.pmi_rank[pid]; status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), - &sent, &closed); + &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI header upstream\n"); HYDU_ASSERT(!closed, status); } @@ -340,12 +340,14 @@ hdr.pid = fd; hdr.buflen = strlen(buf); status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI header upstream\n"); HYDU_ASSERT(!closed, status); status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI command upstream\n"); HYDU_ASSERT(!closed, status); @@ -399,7 +401,7 @@ pmi_cmd); } - status = HYDU_sock_write(hdr.pid, buf, hdr.buflen, &sent, &closed); + status = HYDU_sock_write(hdr.pid, buf, hdr.buflen, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to forward PMI response to MPI process\n"); if (HYD_pmcd_pmip.user_global.auto_cleanup) { @@ -727,14 +729,15 @@ HYD_pmcd_init_header(&hdr); hdr.cmd = PID_LIST; status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PID_LIST command upstream\n"); HYDU_ASSERT(!closed, status); status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, HYD_pmcd_pmip.downstream.pid, HYD_pmcd_pmip.local.proxy_process_count * sizeof(int), &sent, - &closed); + &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PID list upstream\n"); HYDU_ASSERT(!closed, status); @@ -929,7 +932,7 @@ HYDU_ASSERT(!closed, status); status = HYDU_sock_write(HYD_pmcd_pmip.downstream.in, buf, hdr.buflen, &count, - &closed); + &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write to downstream stdin\n"); if (HYD_pmcd_pmip.user_global.auto_cleanup) { Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -39,7 +39,8 @@ hdr.buflen = strlen(buf); hdr.pmi_version = 1; status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI header upstream\n"); HYDU_ASSERT(!closed, status); @@ -47,7 +48,8 @@ HYDU_dump(stdout, "forwarding command (%s) upstream\n", buf); } - status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed); + status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI command upstream\n"); HYDU_ASSERT(!closed, status); @@ -72,7 +74,7 @@ HYDU_dump(stdout, "PMI response: %s", cmd); } - status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed); + status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing PMI line\n"); /* FIXME: We cannot abort when we are not able to send data * downstream. The upper layer needs to handle this based on Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -43,7 +43,8 @@ hdr.buflen = strlen(buf); hdr.pmi_version = 2; status = - HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed); + HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI header upstream\n"); HYDU_ASSERT(!closed, status); @@ -51,7 +52,8 @@ HYDU_dump(stdout, "forwarding command (%s) upstream\n", buf); } - status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed); + status = HYDU_sock_write(HYD_pmcd_pmip.upstream.control, buf, hdr.buflen, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI command upstream\n"); HYDU_ASSERT(!closed, status); @@ -72,7 +74,7 @@ HYDU_FUNC_ENTER(); HYDU_snprintf(cmdlen, 7, "%6u", (unsigned) strlen(cmd)); - status = HYDU_sock_write(fd, cmdlen, 6, &sent, &closed); + status = HYDU_sock_write(fd, cmdlen, 6, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing PMI line\n"); /* FIXME: We cannot abort when we are not able to send data * downstream. The upper layer needs to handle this based on @@ -83,7 +85,7 @@ HYDU_dump(stdout, "PMI response: %s\n", cmd); } - status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed); + status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing PMI line\n"); HYDU_ASSERT(!closed, status); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -165,7 +165,8 @@ hdr.cmd = SIGNAL; hdr.signum = signum; - status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to proxy\n"); HYDU_ASSERT(!closed, status); @@ -309,12 +310,14 @@ hdr.buflen = count; - HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &count, &closed); + HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &count, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing to control socket\n"); HYDU_ASSERT(!closed, status); if (hdr.buflen) { - HYDU_sock_write(proxy->control_fd, buf, hdr.buflen, &count, &closed); + HYDU_sock_write(proxy->control_fd, buf, hdr.buflen, &count, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing to control socket\n"); HYDU_ASSERT(!closed, status); @@ -479,7 +482,8 @@ HYD_pmcd_init_header(&hdr); hdr.cmd = PROC_INFO; - status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to proxy\n"); HYDU_ASSERT(!closed, status); @@ -556,7 +560,8 @@ else { hdr.cmd = STDIN; hdr.buflen = 0; - HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &count, &closed); + HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &count, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing to control socket\n"); HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -26,7 +26,8 @@ /* Send the command to all proxies */ for (proxy = pg->proxy_list; proxy; proxy = proxy->next) { - status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send checkpoint message\n"); HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -24,7 +24,7 @@ hdr.pid = pid; hdr.pmi_version = 1; hdr.buflen = strlen(cmd); - status = HYDU_sock_write(fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(fd, &hdr, sizeof(hdr), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI_RESPONSE header to proxy\n"); HYDU_ASSERT(!closed, status); @@ -32,7 +32,7 @@ HYDU_dump(stdout, "PMI response to fd %d pid %d: %s", fd, pid, cmd); } - status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed); + status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send response to command\n"); HYDU_ASSERT(!closed, status); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -33,12 +33,12 @@ hdr.pid = pid; hdr.pmi_version = 2; hdr.buflen = 6 + strlen(cmd); - status = HYDU_sock_write(fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(fd, &hdr, sizeof(hdr), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to send PMI_RESPONSE header to proxy\n"); HYDU_ASSERT(!closed, status); HYDU_snprintf(cmdlen, 7, "%6u", (unsigned) strlen(cmd)); - status = HYDU_sock_write(fd, cmdlen, 6, &sent, &closed); + status = HYDU_sock_write(fd, cmdlen, 6, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing PMI line\n"); HYDU_ASSERT(!closed, status); @@ -46,7 +46,7 @@ HYDU_dump(stdout, "PMI response to fd %d pid %d: %s\n", fd, pid, cmd); } - status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed); + status = HYDU_sock_write(fd, cmd, strlen(cmd), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error writing PMI line\n"); HYDU_ASSERT(!closed, status); Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_launch.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_launch.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_launch.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -31,13 +31,15 @@ HYDU_ASSERT(!closed, status); if (hdr.io_type == HYDT_PERSIST_STDOUT) { - HYDU_sock_write(STDOUT_FILENO, buf, hdr.buflen, &sent, &closed); + HYDU_sock_write(STDOUT_FILENO, buf, hdr.buflen, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "stdout forwarding error\n"); HYDU_ASSERT(!closed, status); HYDU_ASSERT(sent == hdr.buflen, status); } else { - HYDU_sock_write(STDERR_FILENO, buf, hdr.buflen, &sent, &closed); + HYDU_sock_write(STDERR_FILENO, buf, hdr.buflen, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "stderr forwarding error\n"); HYDU_ASSERT(!closed, status); HYDU_ASSERT(sent == hdr.buflen, status); Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_server.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_server.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/persist/persist_server.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -86,12 +86,14 @@ hdr.io_type = HYDT_PERSIST_STDOUT; hdr.buflen = count; - status = HYDU_sock_write(private.client_fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(private.client_fd, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending header to client\n"); HYDU_ASSERT(!closed, status); if (hdr.buflen) { - status = HYDU_sock_write(private.client_fd, buf, count, &sent, &closed); + status = HYDU_sock_write(private.client_fd, buf, count, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending stdout to client\n"); HYDU_ASSERT(!closed, status); } @@ -115,12 +117,14 @@ hdr.io_type = HYDT_PERSIST_STDOUT; hdr.buflen = count; - status = HYDU_sock_write(private.client_fd, &hdr, sizeof(hdr), &sent, &closed); + status = HYDU_sock_write(private.client_fd, &hdr, sizeof(hdr), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending header to client\n"); HYDU_ASSERT(!closed, status); if (hdr.buflen) { - status = HYDU_sock_write(private.client_fd, buf, count, &sent, &closed); + status = HYDU_sock_write(private.client_fd, buf, count, &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending stdout to client\n"); HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/tools/nameserver/hydra_nameserver.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/nameserver/hydra_nameserver.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/tools/nameserver/hydra_nameserver.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -101,12 +101,12 @@ HYDU_FUNC_ENTER(); - status = HYDU_sock_write(fd, &len, sizeof(int), &sent, &closed); + status = HYDU_sock_write(fd, &len, sizeof(int), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending publish info\n"); HYDU_ASSERT(!closed, status); if (len) { - status = HYDU_sock_write(fd, str, len, &sent, &closed); + status = HYDU_sock_write(fd, str, len, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "error sending publish info\n"); HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c =================================================================== --- mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -42,7 +42,8 @@ #endif /* HAVE_ALARM */ cmd.type = HYD_CKPOINT; - HYDU_sock_write(HYD_server_info.cmd_pipe[1], &cmd, sizeof(cmd), &sent, &closed); + HYDU_sock_write(HYD_server_info.cmd_pipe[1], &cmd, sizeof(cmd), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); goto fn_exit; } @@ -61,7 +62,8 @@ HYDU_dump(stdout, "Press Ctrl-C again to force abort\n"); } - HYDU_sock_write(HYD_server_info.cmd_pipe[1], &cmd, sizeof(cmd), &sent, &closed); + HYDU_sock_write(HYD_server_info.cmd_pipe[1], &cmd, sizeof(cmd), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); fn_exit: HYDU_FUNC_EXIT(); Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c =================================================================== --- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -304,7 +304,7 @@ } if (HYD_ui_info.prepend_pattern == NULL) { - status = HYDU_sock_write(fd, buf, buflen, &sent, &closed); + status = HYDU_sock_write(fd, buf, buflen, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to stdout/stderr\n"); HYDU_ASSERT(!closed, status); } @@ -318,10 +318,11 @@ if (buf[i] == '\n' || i == buflen - 1) { if (prepend[0] != '\0') { /* sock_write barfs on maxlen==0 */ status = HYDU_sock_write(fd, (const void *) prepend, - strlen(prepend), &sent, &closed); + strlen(prepend), &sent, &closed, + HYDU_SOCK_COMM_MSGWAIT); } status = HYDU_sock_write(fd, (const void *) &buf[mark], i - mark + 1, - &sent, &closed); + &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to stdout/stderr\n"); HYDU_ASSERT(!closed, status); mark = i + 1; Modified: mpich2/trunk/src/pm/hydra/utils/args/args.c =================================================================== --- mpich2/trunk/src/pm/hydra/utils/args/args.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/utils/args/args.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -402,7 +402,8 @@ /* Check how many arguments we have */ list_len = HYDU_strlist_lastidx(strlist); - status = HYDU_sock_write(fd, &list_len, sizeof(int), &sent, &closed); + status = + HYDU_sock_write(fd, &list_len, sizeof(int), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to proxy\n"); HYDU_ASSERT(!closed, status); @@ -410,11 +411,12 @@ for (i = 0; strlist[i]; i++) { len = strlen(strlist[i]) + 1; - status = HYDU_sock_write(fd, &len, sizeof(int), &sent, &closed); + status = + HYDU_sock_write(fd, &len, sizeof(int), &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to proxy\n"); HYDU_ASSERT(!closed, status); - status = HYDU_sock_write(fd, strlist[i], len, &sent, &closed); + status = HYDU_sock_write(fd, strlist[i], len, &sent, &closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "unable to write data to proxy\n"); HYDU_ASSERT(!closed, status); } Modified: mpich2/trunk/src/pm/hydra/utils/sock/sock.c =================================================================== --- mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2012-11-30 07:48:48 UTC (rev 10696) +++ mpich2/trunk/src/pm/hydra/utils/sock/sock.c 2012-11-30 07:48:54 UTC (rev 10697) @@ -250,9 +250,9 @@ *recvd += tmp; } - if (flag != HYDU_SOCK_COMM_MSGWAIT || *recvd == maxlen) + if (flag == HYDU_SOCK_COMM_NONE || *recvd == maxlen) break; - }; + } fn_exit: HYDU_FUNC_EXIT(); @@ -262,7 +262,8 @@ goto fn_exit; } -HYD_status HYDU_sock_write(int fd, const void *buf, int maxlen, int *sent, int *closed) +HYD_status HYDU_sock_write(int fd, const void *buf, int maxlen, int *sent, int *closed, + enum HYDU_sock_comm_flag flag) { int tmp; HYD_status status = HYD_SUCCESS; @@ -274,19 +275,28 @@ *sent = 0; *closed = 0; while (1) { - do { - tmp = write(fd, (char *) buf + *sent, maxlen - *sent); - } while (tmp < 0 && (errno == EINTR || errno == EAGAIN)); - - if (tmp < 0 || tmp == 0) { - *closed = 1; - goto fn_exit; + tmp = write(fd, (char *) buf + *sent, maxlen - *sent); + if (tmp <= 0) { + if (errno == EAGAIN) { + if (flag == HYDU_SOCK_COMM_NONE) + goto fn_exit; + else + continue; + } + else if (errno == ECONNRESET) { + *closed = 1; + goto fn_exit; + } + HYDU_ERR_SETANDJUMP(status, HYD_SOCK_ERROR, "write error (%s)\n", + HYDU_strerror(errno)); } - *sent += tmp; + else { + *sent += tmp; + } - if (*sent == maxlen) + if (flag == HYDU_SOCK_COMM_NONE || *sent == maxlen) break; - }; + } fn_exit: HYDU_FUNC_EXIT(); @@ -403,7 +413,7 @@ /* there is data in the buffer, send it out first */ status = HYDU_sock_write(out, fwd_hash->buf + fwd_hash->buf_offset, fwd_hash->buf_count, - &count, closed); + &count, closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "write error\n"); if (!*closed) { @@ -417,7 +427,7 @@ while (*closed && fwd_hash->buf_count) { status = HYDU_sock_write(out, fwd_hash->buf + fwd_hash->buf_offset, fwd_hash->buf_count, - &count, closed); + &count, closed, HYDU_SOCK_COMM_MSGWAIT); HYDU_ERR_POP(status, "write error\n"); if (!*closed) {

1 0

r10696 - mpich2/trunk/src/pm/hydra/pm/pmiserv
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:48 -0600 (Fri, 30 Nov 2012) New Revision: 10696 Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c Log: Rename stdio_cb to stdoe_cb to more accurately describe its purpose. No reviewer. Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:46 UTC (rev 10695) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:48 UTC (rev 10696) @@ -18,7 +18,7 @@ static int pmi_storage_len = 0; static char pmi_storage[HYD_TMPBUF_SIZE], *sptr = pmi_storage, r[HYD_TMPBUF_SIZE]; -static HYD_status stdio_cb(int fd, HYD_event_t events, void *userp) +static HYD_status stdoe_cb(int fd, HYD_event_t events, void *userp) { int closed, i, sent, recvd, stdfd; char buf[HYD_TMPBUF_SIZE]; @@ -742,12 +742,12 @@ /* Everything is spawned, register the required FDs */ status = HYDT_dmx_register_fd(HYD_pmcd_pmip.local.proxy_process_count, HYD_pmcd_pmip.downstream.out, HYD_POLLIN, - (void *) (size_t) STDOUT_FILENO, stdio_cb); + (void *) (size_t) STDOUT_FILENO, stdoe_cb); HYDU_ERR_POP(status, "unable to register fd\n"); status = HYDT_dmx_register_fd(HYD_pmcd_pmip.local.proxy_process_count, HYD_pmcd_pmip.downstream.err, HYD_POLLIN, - (void *) (size_t) STDERR_FILENO, stdio_cb); + (void *) (size_t) STDERR_FILENO, stdoe_cb); HYDU_ERR_POP(status, "unable to register fd\n"); fn_exit:

1 0

r10695 - in mpich2/trunk/src/pm/hydra: pm/pmiserv ui/mpich
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:46 -0600 (Fri, 30 Nov 2012) New Revision: 10695 Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c mpich2/trunk/src/pm/hydra/ui/mpich/utils.c Log: White-space cleanup. Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:43 UTC (rev 10694) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:46 UTC (rev 10695) @@ -143,7 +143,8 @@ } } else { /* multi commands */ - for (bufptr = sptr; bufptr < sptr + pmi_storage_len - strlen("endcmd\n") + 1; bufptr++) { + for (bufptr = sptr; bufptr < sptr + pmi_storage_len - strlen("endcmd\n") + 1; + bufptr++) { if (bufptr[0] == 'e' && bufptr[1] == 'n' && bufptr[2] == 'd' && bufptr[3] == 'c' && bufptr[4] == 'm' && bufptr[5] == 'd' && bufptr[6] == '\n') { @@ -222,8 +223,9 @@ * we can, parse out full PMI commands from it, and process * them. When we don't have a full PMI command, we store the * rest. */ - status = HYDU_sock_read(fd, pmi_storage + pmi_storage_len, HYD_TMPBUF_SIZE - pmi_storage_len, - &linelen, &closed, HYDU_SOCK_COMM_NONE); + status = + HYDU_sock_read(fd, pmi_storage + pmi_storage_len, HYD_TMPBUF_SIZE - pmi_storage_len, + &linelen, &closed, HYDU_SOCK_COMM_NONE); HYDU_ERR_POP(status, "unable to read PMI command\n"); /* Try to find the PMI FD */ Modified: mpich2/trunk/src/pm/hydra/ui/mpich/utils.c =================================================================== --- mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-11-30 07:48:43 UTC (rev 10694) +++ mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-11-30 07:48:46 UTC (rev 10695) @@ -1440,7 +1440,8 @@ { printf("\n"); printf("-usize: Universe size (SYSTEM, INFINITE, <value>\n"); - printf(" SYSTEM: Number of cores passed to mpiexec through hostfile or resource manager\n"); + printf + (" SYSTEM: Number of cores passed to mpiexec through hostfile or resource manager\n"); printf(" INFINITE: No limit\n"); printf(" <value>: Numeric value >= 0\n\n"); }

1 0

r10694 - mpich2/trunk/src/pm/hydra/pm/pmiserv
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:43 -0600 (Fri, 30 Nov 2012) New Revision: 10694 Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c Log: Renamed PMI related storage to have a pmi_ prefix. No reviewer. Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:41 UTC (rev 10693) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:43 UTC (rev 10694) @@ -15,8 +15,8 @@ struct HYD_pmcd_pmip HYD_pmcd_pmip; struct HYD_pmcd_pmip_pmi_handle *HYD_pmcd_pmip_pmi_handle = { 0 }; -static int storage_len = 0; -static char storage[HYD_TMPBUF_SIZE], *sptr = storage, r[HYD_TMPBUF_SIZE]; +static int pmi_storage_len = 0; +static char pmi_storage[HYD_TMPBUF_SIZE], *sptr = pmi_storage, r[HYD_TMPBUF_SIZE]; static HYD_status stdio_cb(int fd, HYD_event_t events, void *userp) { @@ -109,7 +109,7 @@ /* We need to read at least 6 bytes before we can decide if this * is PMI-1 or PMI-2 */ - if (storage_len < 6) + if (pmi_storage_len < 6) goto fn_exit; /* FIXME: This should really be a "FIXME" for the client, since @@ -135,7 +135,7 @@ if (!strncmp(sptr, "cmd=", strlen("cmd="))) { /* A newline marks the end of the command */ - for (bufptr = sptr; bufptr < sptr + storage_len; bufptr++) { + for (bufptr = sptr; bufptr < sptr + pmi_storage_len; bufptr++) { if (*bufptr == '\n') { full_command = 1; break; @@ -143,7 +143,7 @@ } } else { /* multi commands */ - for (bufptr = sptr; bufptr < sptr + storage_len - strlen("endcmd\n") + 1; bufptr++) { + for (bufptr = sptr; bufptr < sptr + pmi_storage_len - strlen("endcmd\n") + 1; bufptr++) { if (bufptr[0] == 'e' && bufptr[1] == 'n' && bufptr[2] == 'd' && bufptr[3] == 'c' && bufptr[4] == 'm' && bufptr[5] == 'd' && bufptr[6] == '\n') { @@ -162,7 +162,7 @@ lenptr[6] = 0; cmdlen = atoi(lenptr); - if (storage_len >= cmdlen + 6) { + if (pmi_storage_len >= cmdlen + 6) { full_command = 1; bufptr = sptr + 6 + cmdlen - 1; } @@ -174,11 +174,11 @@ HYDU_MALLOC(*buf, char *, buflen, status); memcpy(*buf, sptr, buflen); sptr += buflen; - storage_len -= buflen; + pmi_storage_len -= buflen; (*buf)[buflen - 1] = '\0'; - if (storage_len == 0) - sptr = storage; + if (pmi_storage_len == 0) + sptr = pmi_storage; else *repeat = 1; } @@ -189,10 +189,10 @@ /* FIXME: This dual memcpy is crazy and needs to be * fixed. Single memcpy should be possible, but we need to be * a bit careful not to corrupt the buffer. */ - if (sptr != storage) { - memcpy(r, sptr, storage_len); - memcpy(storage, r, storage_len); - sptr = storage; + if (sptr != pmi_storage) { + memcpy(r, sptr, pmi_storage_len); + memcpy(pmi_storage, r, pmi_storage_len); + sptr = pmi_storage; } *buf = NULL; } @@ -222,7 +222,7 @@ * we can, parse out full PMI commands from it, and process * them. When we don't have a full PMI command, we store the * rest. */ - status = HYDU_sock_read(fd, storage + storage_len, HYD_TMPBUF_SIZE - storage_len, + status = HYDU_sock_read(fd, pmi_storage + pmi_storage_len, HYD_TMPBUF_SIZE - pmi_storage_len, &linelen, &closed, HYDU_SOCK_COMM_NONE); HYDU_ERR_POP(status, "unable to read PMI command\n"); @@ -287,8 +287,8 @@ goto fn_exit; } else { - storage_len += linelen; - storage[storage_len] = 0; + pmi_storage_len += linelen; + pmi_storage[pmi_storage_len] = 0; } /* We were able to read the PMI command correctly. If we were able

1 0

r10693 - mpich2/trunk/src/pm/hydra/pm/pmiserv
by balaji＠mcs.anl.gov 30 Nov '12

30 Nov '12

Author: balaji Date: 2012-11-30 01:48:41 -0600 (Fri, 30 Nov 2012) New Revision: 10693 Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c Log: Minor bug-fix in the stdin handling code. No reviewer. Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-29 21:43:43 UTC (rev 10692) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-11-30 07:48:41 UTC (rev 10693) @@ -933,7 +933,7 @@ if (HYD_pmcd_pmip.user_global.auto_cleanup) { HYDU_ASSERT(!closed, status); } - else { + else if (closed) { close(HYD_pmcd_pmip.downstream.in); HYD_pmcd_pmip.downstream.in = HYD_FD_CLOSED; } @@ -942,6 +942,7 @@ } else { close(HYD_pmcd_pmip.downstream.in); + HYD_pmcd_pmip.downstream.in = HYD_FD_CLOSED; } } else {

1 0

r10690 - mpich2/trunk/src/pm/hydra/ui/mpich
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:05 -0600 (Thu, 29 Nov 2012) New Revision: 10690 Modified: mpich2/trunk/src/pm/hydra/ui/mpich/utils.c Log: Provide an environment variable to disable hostname propagation. Fixes tt#1749. No reviewer. Modified: mpich2/trunk/src/pm/hydra/ui/mpich/utils.c =================================================================== --- mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-11-29 16:20:03 UTC (rev 10689) +++ mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-11-29 16:20:05 UTC (rev 10690) @@ -1540,6 +1540,11 @@ if (HYD_uii_mpx_exec_list == NULL && HYD_server_info.user_global.ckpoint_prefix == NULL) HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "no executable provided\n"); + /* If hostname propagation is not set on the command-line, check + * for the environment variable */ + if (hostname_propagation == -1) + MPL_env2bool("HYDRA_HOSTNAME_PROPAGATION", &hostname_propagation); + /* If an interface is provided, set that */ if (HYD_server_info.user_global.iface) { if (hostname_propagation == 1) {

1 0