[mpich2-commits] r5630 - in mpich2/trunk/src/pm/hydra: include pm/pmiserv tools/bind utils/launch
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu Oct 29 23:03:39 CDT 2009
Author: balaji
Date: 2009-10-29 23:03:39 -0500 (Thu, 29 Oct 2009)
New Revision: 5630
Modified:
mpich2/trunk/src/pm/hydra/include/hydra_tools.h
mpich2/trunk/src/pm/hydra/include/hydra_utils.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c
mpich2/trunk/src/pm/hydra/tools/bind/bind.c
mpich2/trunk/src/pm/hydra/utils/launch/launch.c
Log:
Use consistent naming convention for the process-core binding
parameters in the upper layers as the binding library itself.
Modified: mpich2/trunk/src/pm/hydra/include/hydra_tools.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_tools.h 2009-10-30 04:03:36 UTC (rev 5629)
+++ mpich2/trunk/src/pm/hydra/include/hydra_tools.h 2009-10-30 04:03:39 UTC (rev 5630)
@@ -12,8 +12,8 @@
/* bind */
HYD_status HYDT_bind_init(char *binding, char *bindlib);
void HYDT_bind_finalize(void);
-HYD_status HYDT_bind_process(int core);
-int HYDT_bind_get_core_id(int id);
+HYD_status HYDT_bind_process(int proc_unit_id);
+int HYDT_bind_get_proc_unit_id(int process_id);
/* checkpointing */
HYD_status HYDT_ckpoint_init(char *ckpointlib, char *ckpoint_prefix);
Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-30 04:03:36 UTC (rev 5629)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-30 04:03:39 UTC (rev 5630)
@@ -160,8 +160,8 @@
#endif /* HAVE_THREAD_SUPPORT */
HYD_status HYDU_create_process(char **client_arg, HYD_env_t * env_list,
- int *in, int *out, int *err, int *pid, int core);
-HYD_status HYDU_fork_and_exit(int core);
+ int *in, int *out, int *err, int *pid, int proc_unit_id);
+HYD_status HYDU_fork_and_exit(int proc_unit_id);
#if defined HAVE_THREAD_SUPPORT
HYD_status HYDU_create_thread(void *(*func) (void *), void *args,
struct HYD_thread_context *ctxt);
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-30 04:03:36 UTC (rev 5629)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-30 04:03:39 UTC (rev 5630)
@@ -478,7 +478,7 @@
HYD_status HYD_pmcd_pmi_proxy_launch_procs(void)
{
- int i, j, arg, stdin_fd, process_id, core, pmi_id;
+ int i, j, arg, stdin_fd, process_id, proc_unit_id, pmi_id;
char *str, *envstr, *list;
char *client_args[HYD_NUM_TMP_STRINGS];
HYD_env_t *env, *prop_env = NULL;
@@ -629,13 +629,14 @@
client_args[arg++] = HYDU_strdup(exec->exec[j]);
client_args[arg++] = NULL;
- core = HYDT_bind_get_core_id(process_id);
+ proc_unit_id = HYDT_bind_get_proc_unit_id(process_id);
if (pmi_id == 0) {
status = HYDU_create_process(client_args, prop_env,
&HYD_pmcd_pmip.downstream.in,
&HYD_pmcd_pmip.downstream.out[process_id],
&HYD_pmcd_pmip.downstream.err[process_id],
- &HYD_pmcd_pmip.downstream.pid[process_id], core);
+ &HYD_pmcd_pmip.downstream.pid[process_id],
+ proc_unit_id);
HYD_pmcd_pmip.local.stdin_buf_offset = 0;
HYD_pmcd_pmip.local.stdin_buf_count = 0;
@@ -652,7 +653,8 @@
status = HYDU_create_process(client_args, prop_env, NULL,
&HYD_pmcd_pmip.downstream.out[process_id],
&HYD_pmcd_pmip.downstream.err[process_id],
- &HYD_pmcd_pmip.downstream.pid[process_id], core);
+ &HYD_pmcd_pmip.downstream.pid[process_id],
+ proc_unit_id);
}
HYDU_ERR_POP(status, "create process returned error\n");
Modified: mpich2/trunk/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/bind.c 2009-10-30 04:03:36 UTC (rev 5629)
+++ mpich2/trunk/src/pm/hydra/tools/bind/bind.c 2009-10-30 04:03:39 UTC (rev 5630)
@@ -187,7 +187,7 @@
}
-int HYDT_bind_get_core_id(int id)
+int HYDT_bind_get_proc_unit_id(int id)
{
return HYDT_bind_info.bindmap[id % HYDT_bind_info.num_procs];
}
Modified: mpich2/trunk/src/pm/hydra/utils/launch/launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/launch/launch.c 2009-10-30 04:03:36 UTC (rev 5629)
+++ mpich2/trunk/src/pm/hydra/utils/launch/launch.c 2009-10-30 04:03:39 UTC (rev 5630)
@@ -8,7 +8,7 @@
#include "hydra_tools.h"
HYD_status HYDU_create_process(char **client_arg, HYD_env_t * env_list,
- int *in, int *out, int *err, int *pid, int core)
+ int *in, int *out, int *err, int *pid, int proc_unit_id)
{
int inpipe[2], outpipe[2], errpipe[2], tpid;
HYD_status status = HYD_SUCCESS;
@@ -59,8 +59,8 @@
HYDU_ERR_POP(status, "unable to putenv\n");
}
- if (core >= 0) {
- status = HYDT_bind_process(core);
+ if (proc_unit_id >= 0) {
+ status = HYDT_bind_process(proc_unit_id);
HYDU_ERR_POP(status, "bind process failed\n");
}
@@ -100,7 +100,7 @@
}
-HYD_status HYDU_fork_and_exit(int core)
+HYD_status HYDU_fork_and_exit(int proc_unit_id)
{
pid_t tpid;
HYD_status status = HYD_SUCCESS;
@@ -114,8 +114,8 @@
close(1);
close(2);
- if (core >= 0) {
- status = HYDT_bind_process(core);
+ if (proc_unit_id >= 0) {
+ status = HYDT_bind_process(proc_unit_id);
HYDU_ERR_POP(status, "bind process failed\n");
}
}
More information about the mpich2-commits
mailing list