[mpich2-commits] r5453 - in mpich2/trunk/src/pm/hydra: include pm/pmiserv ui/mpiexec ui/utils utils/launch
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Oct 14 06:35:30 CDT 2009
Author: balaji
Date: 2009-10-14 06:35:29 -0500 (Wed, 14 Oct 2009)
New Revision: 5453
Modified:
mpich2/trunk/src/pm/hydra/include/hydra_base.h
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/ui/mpiexec/mpiexec.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
mpich2/trunk/src/pm/hydra/utils/launch/allocate.c
Log:
Change variable name to maintain consistency with the other names.
Modified: mpich2/trunk/src/pm/hydra/include/hydra_base.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_base.h 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/include/hydra_base.h 2009-10-14 11:35:29 UTC (rev 5453)
@@ -199,7 +199,7 @@
int out;
int err;
- int core_count;
+ int proxy_core_count;
/* Segment list will contain one-pass of the hosts file */
struct HYD_Proxy_segment *segment_list;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy.h 2009-10-14 11:35:29 UTC (rev 5453)
@@ -37,7 +37,7 @@
struct HYD_Env_global global_env;
int global_core_count;
- int core_count;
+ int proxy_core_count;
int exec_proc_count;
int procs_are_launched;
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-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-14 11:35:29 UTC (rev 5453)
@@ -38,7 +38,7 @@
HYD_PMCD_pmi_proxy_params.global_env.inherited = NULL;
HYD_PMCD_pmi_proxy_params.global_core_count = 0;
- HYD_PMCD_pmi_proxy_params.core_count = 0;
+ HYD_PMCD_pmi_proxy_params.proxy_core_count = 0;
HYD_PMCD_pmi_proxy_params.exec_proc_count = 0;
HYD_PMCD_pmi_proxy_params.procs_are_launched = 0;
@@ -536,9 +536,9 @@
HYDU_FUNC_ENTER();
- HYD_PMCD_pmi_proxy_params.core_count = 0;
+ HYD_PMCD_pmi_proxy_params.proxy_core_count = 0;
for (segment = HYD_PMCD_pmi_proxy_params.segment_list; segment; segment = segment->next)
- HYD_PMCD_pmi_proxy_params.core_count += segment->proc_count;
+ HYD_PMCD_pmi_proxy_params.proxy_core_count += segment->proc_count;
HYD_PMCD_pmi_proxy_params.exec_proc_count = 0;
for (exec = HYD_PMCD_pmi_proxy_params.exec_list; exec; exec = exec->next)
@@ -547,7 +547,7 @@
HYDU_MALLOC(pmi_ids, int *, HYD_PMCD_pmi_proxy_params.exec_proc_count * sizeof(int), status);
for (i = 0; i < HYD_PMCD_pmi_proxy_params.exec_proc_count; i++) {
pmi_ids[i] = HYDU_local_to_global_id(i,
- HYD_PMCD_pmi_proxy_params.core_count,
+ HYD_PMCD_pmi_proxy_params.proxy_core_count,
HYD_PMCD_pmi_proxy_params.segment_list,
HYD_PMCD_pmi_proxy_params.global_core_count);
}
@@ -658,7 +658,7 @@
for (i = 0; i < exec->proc_count; i++) {
pmi_id = HYDU_local_to_global_id(process_id,
- HYD_PMCD_pmi_proxy_params.core_count,
+ HYD_PMCD_pmi_proxy_params.proxy_core_count,
HYD_PMCD_pmi_proxy_params.segment_list,
HYD_PMCD_pmi_proxy_params.global_core_count);
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-14 11:35:29 UTC (rev 5453)
@@ -196,7 +196,7 @@
for (exec = proxy->exec_list; exec; exec = exec->next) {
for (i = 0; i < exec->proc_count; i++) {
HYDU_dump(stdout, "%d", HYDU_local_to_global_id(process_id++,
- proxy->core_count,
+ proxy->proxy_core_count,
proxy->segment_list,
HYD_handle.global_core_count));
if (i < exec->proc_count - 1)
@@ -273,7 +273,7 @@
proc_count += exec->proc_count;
for (i = 0; i < proc_count; i++) {
if (HYD_handle.print_all_exitcodes) {
- HYDU_dump(stdout, "[%d]", HYDU_local_to_global_id(i, proxy->core_count,
+ HYDU_dump(stdout, "[%d]", HYDU_local_to_global_id(i, proxy->proxy_core_count,
proxy->segment_list,
HYD_handle.global_core_count));
HYDU_dump(stdout, "%d", WEXITSTATUS(proxy->exit_status[i]));
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c 2009-10-14 11:35:29 UTC (rev 5453)
@@ -167,7 +167,7 @@
HYD_handle.proxy_list->segment_list->start_pid = 0;
HYD_handle.proxy_list->segment_list->proc_count = num_procs;
- HYD_handle.proxy_list->core_count += num_procs;
+ HYD_handle.proxy_list->proxy_core_count += num_procs;
HYD_handle.global_core_count += num_procs;
fn_exit:
@@ -224,7 +224,7 @@
proxy_segment->next->proc_count = num_procs;
}
- HYD_handle.proxy_list->core_count += num_procs;
+ HYD_handle.proxy_list->proxy_core_count += num_procs;
HYD_handle.global_core_count += num_procs;
}
Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-14 11:35:29 UTC (rev 5453)
@@ -195,7 +195,7 @@
proxy = HYD_handle.proxy_list;
exec_info = HYD_handle.exec_info_list;
- proxy_rem_procs = proxy->core_count;
+ proxy_rem_procs = proxy->proxy_core_count;
exec_rem_procs = exec_info ? exec_info->process_count : 0;
while (exec_info) {
if (exec_rem_procs <= proxy_rem_procs) {
@@ -207,7 +207,7 @@
proxy = proxy->next;
if (proxy == NULL)
proxy = HYD_handle.proxy_list;
- proxy_rem_procs = proxy->core_count;
+ proxy_rem_procs = proxy->proxy_core_count;
}
exec_info = exec_info->next;
@@ -222,7 +222,7 @@
proxy = proxy->next;
if (proxy == NULL)
proxy = HYD_handle.proxy_list;
- proxy_rem_procs = proxy->core_count;
+ proxy_rem_procs = proxy->proxy_core_count;
}
}
@@ -310,7 +310,7 @@
HYDU_dump(stdout, " Proxy ID: %2d\n", i++);
HYDU_dump(stdout, " -----------------\n");
HYDU_dump(stdout, " Proxy name: %s\n", proxy->hostname);
- HYDU_dump(stdout, " Process count: %d\n", proxy->core_count);
+ HYDU_dump(stdout, " Process count: %d\n", proxy->proxy_core_count);
HYDU_dump(stdout, "\n");
HYDU_dump(stdout, " Proxy segment list:\n");
HYDU_dump(stdout, " .......................\n");
Modified: mpich2/trunk/src/pm/hydra/utils/launch/allocate.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/launch/allocate.c 2009-10-12 22:16:13 UTC (rev 5452)
+++ mpich2/trunk/src/pm/hydra/utils/launch/allocate.c 2009-10-14 11:35:29 UTC (rev 5453)
@@ -26,7 +26,7 @@
(*proxy)->exec_args = NULL;
(*proxy)->segment_list = NULL;
- (*proxy)->core_count = 0;
+ (*proxy)->proxy_core_count = 0;
(*proxy)->exit_status = NULL;
(*proxy)->control_fd = -1;
@@ -174,7 +174,7 @@
HYDU_ERR_POP(status, "Unable to alloc proxy\n");
(*proxy_list)->segment_list = segment;
(*proxy_list)->hostname = HYDU_strdup(hostname);
- (*proxy_list)->core_count += segment->proc_count;
+ (*proxy_list)->proxy_core_count += segment->proc_count;
}
else {
proxy = *proxy_list;
@@ -188,7 +188,7 @@
s = s->next;
s->next = segment;
}
- proxy->core_count += segment->proc_count;
+ proxy->proxy_core_count += segment->proc_count;
break;
}
else if (proxy->next == NULL) {
@@ -196,7 +196,7 @@
HYDU_ERR_POP(status, "Unable to alloc proxy\n");
proxy->next->segment_list = segment;
proxy->next->hostname = HYDU_strdup(hostname);
- proxy->next->core_count += segment->proc_count;
+ proxy->next->proxy_core_count += segment->proc_count;
break;
}
else {
More information about the mpich2-commits
mailing list