[mpich2-commits] r5467 - in mpich2/trunk/src/pm/hydra: pm/pmiserv ui/mpiexec utils/others
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu Oct 15 12:10:37 CDT 2009
Author: balaji
Date: 2009-10-15 12:10:37 -0500 (Thu, 15 Oct 2009)
New Revision: 5467
Modified:
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
mpich2/trunk/src/pm/hydra/utils/others/others.c
Log:
White space cleanup.
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-10-15 17:10:32 UTC (rev 5466)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.c 2009-10-15 17:10:37 UTC (rev 5467)
@@ -137,8 +137,8 @@
}
else { /* Persistent mode */
status = HYDU_sock_listen(&listenfd, NULL,
- (uint16_t *) & HYD_PMCD_pmi_proxy_params.upstream.
- server_port);
+ (uint16_t *) & HYD_PMCD_pmi_proxy_params.
+ upstream.server_port);
HYDU_ERR_POP(status, "unable to listen on socket\n");
/* Register the listening socket with the demux engine */
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-15 17:10:32 UTC (rev 5466)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-15 17:10:37 UTC (rev 5467)
@@ -143,16 +143,16 @@
if (!strcmp(argtype, "--global-inherited-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.
- inherited);
+ &HYD_PMCD_pmi_proxy_params.user_global.
+ global_env.inherited);
else if (!strcmp(argtype, "--global-system-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.
- system);
+ &HYD_PMCD_pmi_proxy_params.user_global.
+ global_env.system);
else if (!strcmp(argtype, "--global-user-env"))
HYDU_append_env_to_list(*env,
- &HYD_PMCD_pmi_proxy_params.user_global.global_env.
- user);
+ &HYD_PMCD_pmi_proxy_params.user_global.
+ global_env.user);
HYDU_FREE(env);
}
@@ -580,8 +580,8 @@
while (envstr) {
env =
HYDU_env_lookup(envstr,
- HYD_PMCD_pmi_proxy_params.user_global.global_env.
- inherited);
+ HYD_PMCD_pmi_proxy_params.user_global.
+ global_env.inherited);
if (env) {
status = HYDU_append_env_to_list(*env, &prop_env);
HYDU_ERR_POP(status, "unable to add env to list\n");
@@ -624,8 +624,8 @@
pmi_id = HYDU_local_to_global_id(process_id,
HYD_PMCD_pmi_proxy_params.start_pid,
HYD_PMCD_pmi_proxy_params.local.proxy_core_count,
- HYD_PMCD_pmi_proxy_params.system_global.
- global_core_count);
+ HYD_PMCD_pmi_proxy_params.
+ system_global.global_core_count);
if (HYD_PMCD_pmi_proxy_params.system_global.pmi_port_str) {
str = HYDU_int_to_str(pmi_id);
@@ -648,12 +648,12 @@
if (pmi_id == 0) {
status = HYDU_create_process(client_args, prop_env,
&HYD_PMCD_pmi_proxy_params.downstream.in,
- &HYD_PMCD_pmi_proxy_params.downstream.
- out[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.
- err[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.
- pid[process_id], core);
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.out[process_id],
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.err[process_id],
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.pid[process_id], core);
HYD_PMCD_pmi_proxy_params.local.stdin_buf_offset = 0;
HYD_PMCD_pmi_proxy_params.local.stdin_buf_count = 0;
@@ -668,12 +668,12 @@
}
else {
status = HYDU_create_process(client_args, prop_env, NULL,
- &HYD_PMCD_pmi_proxy_params.downstream.
- out[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.
- err[process_id],
- &HYD_PMCD_pmi_proxy_params.downstream.
- pid[process_id], core);
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.out[process_id],
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.err[process_id],
+ &HYD_PMCD_pmi_proxy_params.
+ downstream.pid[process_id], core);
}
HYDU_ERR_POP(status, "create process returned error\n");
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-10-15 17:10:32 UTC (rev 5466)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c 2009-10-15 17:10:37 UTC (rev 5467)
@@ -255,7 +255,8 @@
proxy->exec_launch_info[arg++] = HYDU_strdup("--ckpoint-prefix");
if (HYD_handle.user_global.ckpoint_prefix)
- proxy->exec_launch_info[arg++] = HYDU_strdup(HYD_handle.user_global.ckpoint_prefix);
+ proxy->exec_launch_info[arg++] =
+ HYDU_strdup(HYD_handle.user_global.ckpoint_prefix);
else
proxy->exec_launch_info[arg++] = HYDU_strdup("HYDRA_NULL");
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-15 17:10:32 UTC (rev 5466)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-15 17:10:37 UTC (rev 5467)
@@ -211,8 +211,7 @@
}
FORALL_ACTIVE_PROXIES(proxy, HYD_handle.proxy_list)
- HYDU_MALLOC(proxy->exit_status, int *, proxy->proxy_process_count * sizeof(int),
- status);
+ HYDU_MALLOC(proxy->exit_status, int *, proxy->proxy_process_count * sizeof(int), status);
/* Launch the processes */
status = HYD_PMCI_launch_procs();
Modified: mpich2/trunk/src/pm/hydra/utils/others/others.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/others/others.c 2009-10-15 17:10:32 UTC (rev 5466)
+++ mpich2/trunk/src/pm/hydra/utils/others/others.c 2009-10-15 17:10:37 UTC (rev 5467)
@@ -25,7 +25,7 @@
/* Run to the last proxy */
for (proxy = *proxy_list; proxy->next; proxy = proxy->next);
- if (strcmp(proxy->hostname, hostname)) { /* hostname doesn't match */
+ if (strcmp(proxy->hostname, hostname)) { /* hostname doesn't match */
status = HYDU_alloc_proxy(&proxy->next);
HYDU_ERR_POP(status, "unable to alloc proxy\n");
proxy->next->hostname = HYDU_strdup(hostname);
@@ -42,9 +42,7 @@
goto fn_exit;
}
-int HYDU_local_to_global_id(int local_id, int start_pid, int core_count,
- int global_core_count)
+int HYDU_local_to_global_id(int local_id, int start_pid, int core_count, int global_core_count)
{
- return ((local_id / core_count) * global_core_count) + (local_id % core_count) +
- start_pid;
+ return ((local_id / core_count) * global_core_count) + (local_id % core_count) + start_pid;
}
More information about the mpich2-commits
mailing list