- commits - mailman3.cels.anl.gov

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

r10689 - mpich2/trunk/test/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:03 -0600 (Thu, 29 Nov 2012) New Revision: 10689 Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c Log: Updated the comm_split_type test to respect MPI_UNDEFINED. Reviewed by goodell. Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c =================================================================== --- mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:02 UTC (rev 10688) +++ mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:03 UTC (rev 10689) @@ -24,16 +24,36 @@ verbose = 1; MPI_Comm_rank( MPI_COMM_WORLD, &wrank ); + + /* Check to see if MPI_COMM_TYPE_SHARED works correctly */ MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, 0, MPI_INFO_NULL, &comm); + if (comm == MPI_COMM_NULL) + printf("Expected a non-null communicator, but got MPI_COMM_NULL\n"); + else { + MPI_Comm_rank(comm, &rank); + MPI_Comm_size(comm, &size); + if (rank == 0 && verbose) + printf("Created subcommunicator of size %d\n", size); + MPI_Comm_free(&comm); + } - MPI_Comm_rank(comm, &rank); - MPI_Comm_size(comm, &size); + /* Check to see if MPI_UNDEFINED is respected */ + MPI_Comm_split_type(MPI_COMM_WORLD, (wrank % 2 == 0) ? MPI_COMM_TYPE_SHARED : MPI_UNDEFINED, + 0, MPI_INFO_NULL, &comm); + if ((wrank % 2) && (comm != MPI_COMM_NULL)) + printf("Expected MPI_COMM_NULL, but did not get one\n"); + if (wrank % 2 == 0) { + if (comm == MPI_COMM_NULL) + printf("Expected a non-null communicator, but got MPI_COMM_NULL\n"); + else { + MPI_Comm_rank(comm, &rank); + MPI_Comm_size(comm, &size); + if (rank == 0 && verbose) + printf("Created subcommunicator of size %d\n", size); + MPI_Comm_free(&comm); + } + } - if (rank == 0 && verbose) - printf("Created subcommunicator of size %d\n", size); - - MPI_Comm_free(&comm); - /* Use wrank because Comm_split_type may return more than one communicator across the job, and if so, each will have a rank 0 entry. Test output rules are for a single process to write the successful

1 0

r10688 - mpich2/trunk/test/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:02 -0600 (Thu, 29 Nov 2012) New Revision: 10688 Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c Log: MPI_Comm_split_type is a part of MPI-3. We don't need to protect it in non-strict MPI or MPICH-specific tests. No reviewer. Modified: mpich2/trunk/test/mpi/comm/cmsplit_type.c =================================================================== --- mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:01 UTC (rev 10687) +++ mpich2/trunk/test/mpi/comm/cmsplit_type.c 2012-11-29 16:20:02 UTC (rev 10688) @@ -24,11 +24,7 @@ verbose = 1; MPI_Comm_rank( MPI_COMM_WORLD, &wrank ); -#if !defined(USE_STRICT_MPI) && defined(MPICH) MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, 0, MPI_INFO_NULL, &comm); -#else - MPI_Comm_split(MPI_COMM_WORLD, 0, 0, &comm); -#endif /* USE_STRICT_MPI */ MPI_Comm_rank(comm, &rank); MPI_Comm_size(comm, &size);

1 0

r10687 - mpich2/trunk/src/mpi/comm
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:20:01 -0600 (Thu, 29 Nov 2012) New Revision: 10687 Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c Log: White space cleanup. No reviewer. Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c =================================================================== --- mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:19:33 UTC (rev 10686) +++ mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:20:01 UTC (rev 10687) @@ -91,7 +91,7 @@ .seealso: MPI_Comm_free @*/ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, - MPI_Comm * newcomm) + MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL, *newcomm_ptr;

1 0

r10686 - in mpich2/trunk/src: mpi/comm mpid/ch3/src
by balaji＠mcs.anl.gov 29 Nov '12

29 Nov '12

Author: balaji Date: 2012-11-29 10:19:33 -0600 (Thu, 29 Nov 2012) New Revision: 10686 Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c mpich2/trunk/src/mpid/ch3/src/mpid_init.c Log: Added support for MPI_UNDEFINED in MPI_Comm_split_type. Fixes tt#1753. Reviewed by goodell. Modified: mpich2/trunk/src/mpi/comm/comm_split_type.c =================================================================== --- mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-28 19:56:15 UTC (rev 10685) +++ mpich2/trunk/src/mpi/comm/comm_split_type.c 2012-11-29 16:19:33 UTC (rev 10686) @@ -34,11 +34,16 @@ { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(split_type == MPI_COMM_TYPE_SHARED); + /* Only MPI_COMM_TYPE_SHARED and MPI_UNDEFINED are supported */ + MPIU_Assert(split_type == MPI_COMM_TYPE_SHARED || split_type == MPI_UNDEFINED); if (MPID_Comm_fns == NULL || MPID_Comm_fns->split_type == NULL) { - /* Default implementation is to just return MPI_COMM_SELF */ - mpi_errno = MPIR_Comm_split_impl(comm_ptr, comm_ptr->rank, key, newcomm_ptr); + int color = (split_type == MPI_COMM_TYPE_SHARED) ? comm_ptr->rank : MPI_UNDEFINED; + + /* The default implementation is to either pass MPI_UNDEFINED + * or the local rank as the color (in which case a dup of + * MPI_COMM_SELF is returned) */ + mpi_errno = MPIR_Comm_split_impl(comm_ptr, color, key, newcomm_ptr); } else { mpi_errno = Modified: mpich2/trunk/src/mpid/ch3/src/mpid_init.c =================================================================== --- mpich2/trunk/src/mpid/ch3/src/mpid_init.c 2012-11-28 19:56:15 UTC (rev 10685) +++ mpich2/trunk/src/mpid/ch3/src/mpid_init.c 2012-11-29 16:19:33 UTC (rev 10686) @@ -55,7 +55,7 @@ mpi_errno = MPID_Get_node_id(comm_ptr, comm_ptr->rank, &id); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - nid = id; + nid = (stype == MPI_COMM_TYPE_SHARED) ? id : MPI_UNDEFINED; mpi_errno = MPIR_Comm_split_impl(comm_ptr, nid, key, newcomm_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno);

1 0