[mpich2-commits] r4223 - in mpich2/trunk/src/pm/hydra: control/consys launcher/mpiexec pm/pmiserv utils/bind
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Sun Mar 29 23:43:50 CDT 2009
Author: balaji
Date: 2009-03-29 23:43:50 -0500 (Sun, 29 Mar 2009)
New Revision: 4223
Modified:
mpich2/trunk/src/pm/hydra/control/consys/consys_launch.c
mpich2/trunk/src/pm/hydra/control/consys/consys_wait.c
mpich2/trunk/src/pm/hydra/launcher/mpiexec/Makefile.sm
mpich2/trunk/src/pm/hydra/launcher/mpiexec/callback.c
mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
mpich2/trunk/src/pm/hydra/utils/bind/bind.c
Log:
Compiler and valgrind warning stomp.
Modified: mpich2/trunk/src/pm/hydra/control/consys/consys_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/control/consys/consys_launch.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/control/consys/consys_launch.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -13,8 +13,6 @@
HYD_Status HYD_CSI_launch_procs(void)
{
- struct HYD_Partition *partition;
- int stdin_fd;
HYD_Status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
Modified: mpich2/trunk/src/pm/hydra/control/consys/consys_wait.c
===================================================================
--- mpich2/trunk/src/pm/hydra/control/consys/consys_wait.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/control/consys/consys_wait.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -13,8 +13,6 @@
HYD_Status HYD_CSI_wait_for_completion(void)
{
- int sockets_open;
- struct HYD_Partition *partition;
HYD_Status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/Makefile.sm
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/Makefile.sm 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/Makefile.sm 2009-03-30 04:43:50 UTC (rev 4223)
@@ -12,7 +12,8 @@
-I../../include \
-I../../../../include \
-I${abs_srcdir}/../utils \
- -I${abs_srcdir}/../../control/include
+ -I${abs_srcdir}/../../control/include \
+ -I${abs_srcdir}/../../demux
install_BIN = mpiexec
# Use the mpich2-build-install target to include mpiexec in the build bin
Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/callback.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/callback.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/callback.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -8,6 +8,7 @@
#include "hydra_utils.h"
#include "mpiexec.h"
#include "csi.h"
+#include "demux.h"
extern HYD_Handle handle;
@@ -35,11 +36,11 @@
}
}
-fn_exit:
+ fn_exit:
HYDU_FUNC_EXIT();
return status;
-fn_fail:
+ fn_fail:
goto fn_exit;
}
Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -9,6 +9,7 @@
#include "mpiexec.h"
#include "lchu.h"
#include "csi.h"
+#include "demux.h"
extern HYD_Handle handle;
@@ -109,12 +110,10 @@
/* Setup stdout/stderr/stdin handlers */
for (partition = handle.partition_list; partition; partition = partition->next) {
- status = HYD_DMX_register_fd(1, &partition->out, HYD_STDOUT, NULL,
- HYD_LCHI_stdout_cb);
+ status = HYD_DMX_register_fd(1, &partition->out, HYD_STDOUT, NULL, HYD_LCHI_stdout_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
- status = HYD_DMX_register_fd(1, &partition->err, HYD_STDOUT, NULL,
- HYD_LCHI_stderr_cb);
+ status = HYD_DMX_register_fd(1, &partition->err, HYD_STDOUT, NULL, HYD_LCHI_stderr_cb);
HYDU_ERR_POP(status, "demux returned error registering fd\n");
}
Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -334,8 +334,7 @@
HYDU_ERR_POP(status, "unable to get base path\n");
/* Proxy setup or teardown */
- if ((handle.launch_mode == HYD_LAUNCH_BOOT) ||
- (handle.launch_mode == HYD_LAUNCH_SHUTDOWN)) {
+ if ((handle.launch_mode == HYD_LAUNCH_BOOT) || (handle.launch_mode == HYD_LAUNCH_SHUTDOWN)) {
/* NULL out variables we don't care about */
HYDU_ERR_CHKANDJUMP(status, handle.prop != HYD_ENV_PROP_UNSET, HYD_INTERNAL_ERROR,
@@ -349,7 +348,7 @@
HYDU_ERR_CHKANDJUMP(status, handle.exec_info_list, HYD_INTERNAL_ERROR,
"executables specified in proxy launch mode\n");
}
- else { /* Application launch */
+ else { /* Application launch */
if (handle.exec_info_list == NULL)
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "no local options set\n");
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -95,8 +95,6 @@
int main(int argc, char **argv)
{
int i, ret_status;
- struct HYD_Partition_exec *exec;
- struct HYD_Partition_segment *segment;
HYD_Status status = HYD_SUCCESS;
status = HYD_PMCD_pmi_proxy_get_params(argv);
@@ -136,7 +134,7 @@
for (i = 0; i < HYD_PMCD_pmi_proxy_params.exec_proc_count; i++)
ret_status |= HYD_PMCD_pmi_proxy_params.exit_status[i];
}
- else { /* Persistent mode */
+ else { /* Persistent mode */
do {
/* Wait for the processes to finish. If there are no
* processes, we will just wait blocking for the work to
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-03-30 04:43:50 UTC (rev 4223)
@@ -61,7 +61,7 @@
HYD_Status HYD_PMCD_pmi_proxy_get_params(char **t_argv);
HYD_Status HYD_PMCD_pmi_proxy_cleanup_params(void);
HYD_Status HYD_PMCD_pmi_proxy_procinfo(int fd);
-HYD_Status HYD_PMCD_pmi_proxy_launch(void);
+HYD_Status HYD_PMCD_pmi_proxy_launch_procs(void);
void HYD_PMCD_pmi_proxy_killjob(void);
/* callback */
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -353,7 +353,7 @@
status = HYDU_sock_read(fd, &num_strings, sizeof(int), &recvd);
HYDU_ERR_POP(status, "error reading data from upstream\n");
- HYDU_MALLOC(arglist, char **, num_strings * sizeof(char *), status);
+ HYDU_MALLOC(arglist, char **, (num_strings + 1) * sizeof(char *), status);
for (i = 0; i < num_strings; i++) {
status = HYDU_sock_read(fd, &str_len, sizeof(int), &recvd);
@@ -370,6 +370,9 @@
status = parse_params(arglist);
HYDU_ERR_POP(status, "unable to parse argument list\n");
+ HYDU_free_strlist(arglist);
+ HYDU_FREE(arglist);
+
/* Save this fd as we need to send back the exit status on
* this. */
HYD_PMCD_pmi_proxy_params.control_fd = fd;
@@ -383,7 +386,7 @@
}
-HYD_Status HYD_PMCD_pmi_proxy_launch_procs()
+HYD_Status HYD_PMCD_pmi_proxy_launch_procs(void)
{
int i, j, arg, stdin_fd, process_id, core, pmi_id, rem;
char *str;
@@ -396,8 +399,7 @@
HYDU_FUNC_ENTER();
HYD_PMCD_pmi_proxy_params.partition_proc_count = 0;
- for (segment = HYD_PMCD_pmi_proxy_params.segment_list; segment;
- segment = segment->next)
+ for (segment = HYD_PMCD_pmi_proxy_params.segment_list; segment; segment = segment->next)
HYD_PMCD_pmi_proxy_params.partition_proc_count += segment->proc_count;
HYD_PMCD_pmi_proxy_params.exec_proc_count = 0;
@@ -452,8 +454,7 @@
if (chdir(HYD_PMCD_pmi_proxy_params.wdir) < 0)
HYDU_ERR_SETANDJUMP1(status, HYD_INTERNAL_ERROR,
- "unable to change wdir (%s)\n",
- HYDU_strerror(errno));
+ "unable to change wdir (%s)\n", HYDU_strerror(errno));
for (j = 0, arg = 0; exec->exec[j]; j++)
client_args[arg++] = HYDU_strdup(exec->exec[j]);
@@ -465,8 +466,7 @@
&HYD_PMCD_pmi_proxy_params.in,
&HYD_PMCD_pmi_proxy_params.out[process_id],
&HYD_PMCD_pmi_proxy_params.err[process_id],
- &HYD_PMCD_pmi_proxy_params.pid[process_id],
- core);
+ &HYD_PMCD_pmi_proxy_params.pid[process_id], core);
status = HYDU_sock_set_nonblock(HYD_PMCD_pmi_proxy_params.in);
HYDU_ERR_POP(status, "unable to set socket as non-blocking\n");
@@ -486,8 +486,7 @@
NULL,
&HYD_PMCD_pmi_proxy_params.out[process_id],
&HYD_PMCD_pmi_proxy_params.err[process_id],
- &HYD_PMCD_pmi_proxy_params.pid[process_id],
- core);
+ &HYD_PMCD_pmi_proxy_params.pid[process_id], core);
}
HYDU_ERR_POP(status, "spawn process returned error\n");
@@ -532,10 +531,5 @@
}
}
- fn_exit:
HYDU_FUNC_EXIT();
- return;
-
- fn_fail:
- goto fn_exit;
}
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_cb.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -129,6 +129,8 @@
HYDU_FREE(buf);
if (str1)
HYDU_FREE(str1);
+ if (str2)
+ HYDU_FREE(str2);
HYDU_FUNC_EXIT();
return status;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -123,12 +123,6 @@
/* Local proxy is a proxy that is local to this process */
static HYD_Status launch_procs_in_runtime_mode(void)
{
- int i, arg, process_id;
- char *path_str[HYD_NUM_TMP_STRINGS];
- HYD_Env_t *env;
- struct HYD_Partition *partition;
- struct HYD_Partition_exec *exec;
- struct HYD_Partition_segment *segment;
HYD_Status status = HYD_SUCCESS;
status = fill_in_proxy_args();
@@ -272,8 +266,7 @@
first_partition = 1;
for (partition = handle.partition_list; partition; partition = partition->next) {
- status = HYDU_sock_connect(partition->name, handle.proxy_port,
- &partition->control_fd);
+ status = HYDU_sock_connect(partition->name, handle.proxy_port, &partition->control_fd);
HYDU_ERR_POP(status, "unable to connect to proxy\n");
cmd = PROC_INFO;
@@ -293,8 +286,7 @@
status = HYDU_sock_write(partition->control_fd, &arg_len, sizeof(int));
HYDU_ERR_POP(status, "unable to write data to proxy\n");
- status = HYDU_sock_write(partition->control_fd, partition->proxy_args[i],
- arg_len);
+ status = HYDU_sock_write(partition->control_fd, partition->proxy_args[i], arg_len);
HYDU_ERR_POP(status, "unable to write data to proxy\n");
}
@@ -448,8 +440,7 @@
HYDU_FUNC_ENTER();
- if ((handle.launch_mode == HYD_LAUNCH_BOOT) ||
- (handle.launch_mode == HYD_LAUNCH_SHUTDOWN)) {
+ if ((handle.launch_mode == HYD_LAUNCH_BOOT) || (handle.launch_mode == HYD_LAUNCH_SHUTDOWN)) {
status = HYD_SUCCESS;
}
else {
Modified: mpich2/trunk/src/pm/hydra/utils/bind/bind.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/bind/bind.c 2009-03-30 03:57:55 UTC (rev 4222)
+++ mpich2/trunk/src/pm/hydra/utils/bind/bind.c 2009-03-30 04:43:50 UTC (rev 4223)
@@ -141,7 +141,6 @@
int HYDU_bind_get_core_id(int id, HYD_Binding binding)
{
int socket = 0, core = 0, curid, realid;
- int i, j;
HYDU_FUNC_ENTER();
More information about the mpich2-commits
mailing list