[mpich2-commits] r7502 - mpich2/trunk/src/pm/hydra/pm/pmiserv
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Nov 24 04:29:14 CST 2010
Author: balaji
Date: 2010-11-24 04:29:14 -0600 (Wed, 24 Nov 2010)
New Revision: 7502
Modified:
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.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
Log:
Valgrind warning squash.
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -9,6 +9,17 @@
#include "pmi_common.h"
#include "bind.h"
+void HYD_pmcd_init_header(struct HYD_pmcd_hdr *hdr)
+{
+ hdr->cmd = INVALID_CMD;
+ hdr->buflen = -1;
+ hdr->pid = -1;
+ hdr->pmi_version = -1;
+ hdr->pgid = -1;
+ hdr->proxy_id = -1;
+ hdr->rank = -1;
+}
+
HYD_status HYD_pmcd_pmi_parse_pmi_cmd(char *obuf, int pmi_version, char **pmi_cmd,
char *args[])
{
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_common.h 2010-11-24 10:29:14 UTC (rev 7502)
@@ -65,6 +65,7 @@
char *val;
};
+void HYD_pmcd_init_header(struct HYD_pmcd_hdr *hdr);
HYD_status HYD_pmcd_pmi_parse_pmi_cmd(char *buf, int pmi_version, char **pmi_cmd,
char *args[]);
HYD_status HYD_pmcd_pmi_args_to_tokens(char *args[], struct HYD_pmcd_token **tokens,
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -264,6 +264,7 @@
}
/* Send the exit status upstream */
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = EXIT_STATUS;
status =
HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -53,12 +53,14 @@
if (recvd) {
if (stdfd == STDOUT_FILENO) {
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = STDOUT;
for (i = 0; i < HYD_pmcd_pmip.local.proxy_process_count; i++)
if (HYD_pmcd_pmip.downstream.out[i] == fd)
break;
}
else {
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = STDERR;
for (i = 0; i < HYD_pmcd_pmip.local.proxy_process_count; i++)
if (HYD_pmcd_pmip.downstream.err[i] == fd)
@@ -265,6 +267,8 @@
HYDU_FUNC_ENTER();
+ HYD_pmcd_init_header(&hdr);
+
status = read_pmi_cmd(fd, &closed);
HYDU_ERR_POP(status, "unable to read PMI command\n");
@@ -739,6 +743,7 @@
}
/* Send the PID list upstream */
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PID_LIST;
status =
HYDU_sock_write(HYD_pmcd_pmip.upstream.control, &hdr, sizeof(hdr), &sent, &closed);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -32,6 +32,7 @@
HYDU_ERR_POP(status, "unable to join strings\n");
HYDU_free_strlist(tmp);
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PMI_CMD;
hdr.pid = fd;
hdr.buflen = strlen(buf);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v2.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -36,6 +36,7 @@
HYDU_ERR_POP(status, "unable to join strings\n");
HYDU_free_strlist(tmp);
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PMI_CMD;
hdr.pid = fd;
hdr.buflen = strlen(buf);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -285,6 +285,7 @@
HYDU_FUNC_ENTER();
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PROC_INFO;
status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to write data to proxy\n");
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmci.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -67,6 +67,7 @@
/* Connect to all proxies and send the checkpoint command */
for (proxy = pg->proxy_list; proxy; proxy = proxy->next) {
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = CKPOINT;
status = HYDU_sock_write(proxy->control_fd, &hdr, sizeof(hdr), &sent, &closed);
HYDU_ERR_POP(status, "unable to send checkpoint message\n");
@@ -250,6 +251,8 @@
status = HYDT_dmx_finalize();
HYDU_ERR_POP(status, "error returned from demux finalize\n");
+ HYDT_bind_finalize();
+
fn_exit:
HYDU_FUNC_EXIT();
return status;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -19,6 +19,7 @@
HYDU_FUNC_ENTER();
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PMI_RESPONSE;
hdr.pid = pid;
hdr.pmi_version = 1;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2010-11-24 09:23:21 UTC (rev 7501)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2010-11-24 10:29:14 UTC (rev 7502)
@@ -28,6 +28,7 @@
HYDU_FUNC_ENTER();
+ HYD_pmcd_init_header(&hdr);
hdr.cmd = PMI_RESPONSE;
hdr.pid = pid;
hdr.pmi_version = 2;
More information about the mpich2-commits
mailing list