[mpich2-commits] r5486 - in mpich2/trunk/src/pm/hydra: rmk/include rmk/pbs rmk/src rmk/utils tools/bootstrap/include tools/bootstrap/slurm tools/bootstrap/src tools/bootstrap/utils ui/mpiexec
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Mon Oct 19 14:24:20 CDT 2009
Author: balaji
Date: 2009-10-19 14:24:19 -0500 (Mon, 19 Oct 2009)
New Revision: 5486
Modified:
mpich2/trunk/src/pm/hydra/rmk/include/rmki.h.in
mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs.h
mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs_query_node_list.c
mpich2/trunk/src/pm/hydra/rmk/src/rmki_query_node_list.c
mpich2/trunk/src/pm/hydra/rmk/utils/rmku.h
mpich2/trunk/src/pm/hydra/rmk/utils/rmku_query_node_list.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h.in
mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm.h
mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm_query_node_list.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c
mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
Log:
Rename misleading variable and function names.
Modified: mpich2/trunk/src/pm/hydra/rmk/include/rmki.h.in
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/include/rmki.h.in 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/include/rmki.h.in 2009-10-19 19:24:19 UTC (rev 5486)
@@ -10,7 +10,7 @@
#include "hydra.h"
struct HYD_rmki_fns {
- HYD_status(*query_node_list) (int *num_nodes, struct HYD_proxy **proxy_list);
+ HYD_status(*query_node_list) (int *num_cores, struct HYD_proxy **proxy_list);
};
extern struct HYD_rmki_fns HYD_rmki_fns;
@@ -18,7 +18,7 @@
HYD_status HYD_rmki_init(char *rmk);
/* Non-zero nodes means that the RMK should allocate the nodes if needed */
-HYD_status HYD_rmki_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYD_rmki_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
/* Each resource management kernel has to expose an initialization function */
@hydra_rmk_init_decl@
Modified: mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs.h
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs.h 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs.h 2009-10-19 19:24:19 UTC (rev 5486)
@@ -9,6 +9,6 @@
#include "hydra_base.h"
-HYD_status HYD_rmkd_pbs_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYD_rmkd_pbs_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
#endif /* RMK_PBS_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/pbs/rmk_pbs_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -38,7 +38,7 @@
goto fn_exit;
}
-HYD_status HYD_rmkd_pbs_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYD_rmkd_pbs_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
char *hostfile;
HYD_status status = HYD_SUCCESS;
@@ -53,7 +53,7 @@
total_num_procs = 0;
status = HYDU_parse_hostfile(hostfile, process_mfile_token);
HYDU_ERR_POP(status, "error parsing hostfile\n");
- *num_nodes = total_num_procs;
+ *num_cores = total_num_procs;
}
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/rmk/src/rmki_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/src/rmki_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/src/rmki_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -7,13 +7,13 @@
#include "hydra_base.h"
#include "rmki.h"
-HYD_status HYD_rmki_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYD_rmki_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYD_rmki_fns.query_node_list(num_nodes, proxy_list);
+ status = HYD_rmki_fns.query_node_list(num_cores, proxy_list);
HYDU_ERR_POP(status, "RMK device returned error while querying node list\n");
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/rmk/utils/rmku.h
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/utils/rmku.h 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/utils/rmku.h 2009-10-19 19:24:19 UTC (rev 5486)
@@ -9,6 +9,6 @@
#include "hydra_base.h"
-HYD_status HYD_rmku_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYD_rmku_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
#endif /* RMKU_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/rmk/utils/rmku_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/rmk/utils/rmku_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/rmk/utils/rmku_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -9,7 +9,7 @@
#include "bsci.h"
#include "rmku.h"
-HYD_status HYD_rmku_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYD_rmku_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
HYD_status status = HYD_SUCCESS;
@@ -17,7 +17,7 @@
/* We just query the bootstrap server for the node list and return
* it to the upper layer. */
- status = HYDT_bsci_query_node_list(num_nodes, proxy_list);
+ status = HYDT_bsci_query_node_list(num_cores, proxy_list);
HYDU_ERR_POP(status, "bootstrap device returned error while querying node list\n");
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h.in
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h.in 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h.in 2009-10-19 19:24:19 UTC (rev 5486)
@@ -18,7 +18,7 @@
struct HYD_proxy *proxy_list);
HYD_status(*finalize) (void);
HYD_status(*wait_for_completion) (struct HYD_proxy *proxy_list);
- HYD_status(*query_node_list) (int *num_nodes, struct HYD_proxy **proxy_list);
+ HYD_status(*query_node_list) (int *num_cores, struct HYD_proxy **proxy_list);
HYD_status(*query_usize) (int *size);
HYD_status(*query_proxy_id) (int *proxy_id);
};
@@ -30,7 +30,7 @@
struct HYD_proxy *proxy_list);
HYD_status HYDT_bsci_finalize(void);
HYD_status HYDT_bsci_wait_for_completion(struct HYD_proxy *proxy_list);
-HYD_status HYDT_bsci_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYDT_bsci_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
HYD_status HYDT_bsci_query_usize(int *size);
HYD_status HYDT_bsci_query_proxy_id(int *proxy_id);
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm.h 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm.h 2009-10-19 19:24:19 UTC (rev 5486)
@@ -12,6 +12,6 @@
HYD_status HYDT_bscd_slurm_launch_procs(char **global_args, const char *proxy_id_str,
struct HYD_proxy *proxy_list);
HYD_status HYDT_bscd_slurm_query_proxy_id(int *proxy_id);
-HYD_status HYDT_bscd_slurm_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYDT_bscd_slurm_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
#endif /* SLURM_H_INCLUDED */
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/slurm/slurm_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -99,11 +99,11 @@
goto fn_exit;
}
-HYD_status HYDT_bscd_slurm_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYDT_bscd_slurm_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
char *str, *num_procs;
char *tmp1[HYD_NUM_TMP_STRINGS], *tmp2[HYD_NUM_TMP_STRINGS];
- int i, j;
+ int i, j, start_pid;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
@@ -118,19 +118,20 @@
full_str_to_groups(str, tmp1);
num_procs = strtok(num_procs, "(");
- *num_nodes = 0;
+ start_pid = 0;
for (i = 0; tmp1[i]; i++) {
status = group_to_individual_nodes(tmp1[i], tmp2);
HYDU_ERR_POP(status, "unable to parse node list\n");
for (j = 0; tmp2[j]; j++) {
- status = HYDU_merge_proxy_segment(tmp2[j], *num_nodes, atoi(num_procs),
+ status = HYDU_merge_proxy_segment(tmp2[j], start_pid, atoi(num_procs),
proxy_list);
HYDU_ERR_POP(status, "merge proxy segment failed\n");
- *num_nodes += atoi(num_procs);
+ start_pid += atoi(num_procs);
}
}
+ *num_cores = start_pid;
}
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -8,13 +8,13 @@
#include "bsci.h"
#include "bscu.h"
-HYD_status HYDT_bsci_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYDT_bsci_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_node_list(num_nodes, proxy_list);
+ status = HYDT_bsci_fns.query_node_list(num_cores, proxy_list);
HYDU_ERR_POP(status, "bootstrap device returned error while querying node list\n");
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h 2009-10-19 19:24:19 UTC (rev 5486)
@@ -11,7 +11,7 @@
HYD_status HYDT_bscu_finalize(void);
HYD_status HYDT_bscu_wait_for_completion(struct HYD_proxy *proxy_list);
-HYD_status HYDT_bscu_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list);
+HYD_status HYDT_bscu_query_node_list(int *num_cores, struct HYD_proxy **proxy_list);
HYD_status HYDT_bscu_query_usize(int *size);
HYD_status HYDT_bscu_query_proxy_id(int *proxy_id);
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -8,15 +8,14 @@
#include "hydra_utils.h"
#include "bscu.h"
-HYD_status HYDT_bscu_query_node_list(int *num_nodes, struct HYD_proxy **proxy_list)
+HYD_status HYDT_bscu_query_node_list(int *num_cores, struct HYD_proxy **proxy_list)
{
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- /* We don't know anything about nodes or resources. Just return
- * NULL. */
- *num_nodes = 0;
+ /* We don't know anything about nodes or resources */
+ *num_cores = 0;
*proxy_list = NULL;
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-19 19:24:18 UTC (rev 5485)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c 2009-10-19 19:24:19 UTC (rev 5486)
@@ -108,7 +108,7 @@
struct HYD_proxy *proxy;
struct HYD_proxy_exec *exec;
struct HYD_exec_info *exec_info;
- int exit_status = 0, timeout, i, process_id, proc_count, num_nodes = 0;
+ int exit_status = 0, timeout, i, process_id, proc_count, num_cores;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
@@ -130,10 +130,11 @@
if (HYD_handle.proxy_list == NULL) {
/* Proxy list is not created yet. The user might not have
- * provided the host file. Query the RMK. We pass a zero node
+ * provided the host file. Query the RMK. We pass a zero core
* count, so the RMK will give us all the nodes it already has
* and won't try to allocate any more. */
- status = HYD_rmki_query_node_list(&num_nodes, &HYD_handle.proxy_list);
+ num_cores = 0;
+ status = HYD_rmki_query_node_list(&num_cores, &HYD_handle.proxy_list);
HYDU_ERR_POP(status, "unable to query the RMK for a node list\n");
/* We don't have an allocation capability yet, but when we do,
@@ -147,7 +148,7 @@
}
else {
/* The RMK returned a node list */
- HYD_handle.global_core_count += num_nodes;
+ HYD_handle.global_core_count += num_cores;
}
}
@@ -155,10 +156,10 @@
* available nodes to each executable */
for (exec_info = HYD_handle.exec_info_list; exec_info; exec_info = exec_info->next) {
if (exec_info->process_count == 0) {
- if (num_nodes == 0)
+ if (num_cores == 0)
exec_info->process_count = 1;
else
- exec_info->process_count = num_nodes;
+ exec_info->process_count = num_cores;
/* If we didn't get anything from the user, take whatever
* the RMK gave */
More information about the mpich2-commits
mailing list