[mpich2-commits] r5458 - in mpich2/trunk/src/pm/hydra: include pm/pmiserv ui/utils utils/alloc
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Wed Oct 14 06:36:00 CDT 2009
Author: balaji
Date: 2009-10-14 06:36:00 -0500 (Wed, 14 Oct 2009)
New Revision: 5458
Modified:
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/ui/utils/uiu.c
mpich2/trunk/src/pm/hydra/utils/alloc/alloc.c
Log:
Unify structure initialization.
Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-14 11:35:56 UTC (rev 5457)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h 2009-10-14 11:36:00 UTC (rev 5458)
@@ -121,6 +121,16 @@
#endif
+/* alloc */
+void HYDU_init_user_global(struct HYD_User_global *user_global);
+void HYDU_init_global_env(struct HYD_Env_global*global_env);
+HYD_Status HYDU_alloc_proxy(struct HYD_Proxy **proxy);
+HYD_Status HYDU_alloc_exec_info(struct HYD_Exec_info **exec_info);
+void HYDU_free_exec_info_list(struct HYD_Exec_info *exec_info_list);
+void HYDU_free_proxy_list(struct HYD_Proxy *proxy_list);
+HYD_Status HYDU_alloc_proxy_segment(struct HYD_Proxy_segment **segment);
+HYD_Status HYDU_alloc_proxy_exec(struct HYD_Proxy_exec **exec);
+
/* args */
HYD_Status HYDU_find_in_path(const char *execname, char **path);
char *HYDU_getcwd(void);
@@ -128,20 +138,17 @@
HYD_Status HYDU_parse_hostfile(char *hostfile,
HYD_Status(*process_token) (char *token, int newline));
-
/* bind */
HYD_Status HYDU_bind_init(char *binding, char *bindlib);
HYD_Status HYDU_bind_process(int core);
int HYDU_bind_get_core_id(int id);
-
/* debug */
HYD_Status HYDU_dbg_init(const char *str);
void HYDU_dump_prefix(FILE *fp);
void HYDU_dump_noprefix(FILE *fp, const char *str, ...);
void HYDU_dump(FILE *fp, const char *str, ...);
-
/* env */
HYD_Status HYDU_env_to_str(HYD_Env_t * env, char **str);
HYD_Status HYDU_str_to_env(char *str, HYD_Env_t **env);
@@ -156,7 +163,6 @@
HYD_Status HYDU_putenv_list(HYD_Env_t * env_list, HYD_Env_overwrite_t overwrite);
HYD_Status HYDU_comma_list_to_env_list(char *str, HYD_Env_t ** env_list);
-
/* launch */
#if defined HAVE_THREAD_SUPPORT
struct HYD_Thread_context {
@@ -164,14 +170,6 @@
};
#endif /* HAVE_THREAD_SUPPORT */
-HYD_Status HYDU_alloc_proxy(struct HYD_Proxy **proxy);
-void HYDU_free_proxy_list(struct HYD_Proxy *proxy);
-HYD_Status HYDU_alloc_exec_info(struct HYD_Exec_info **exec_info);
-void HYDU_free_exec_info_list(struct HYD_Exec_info *exec_info_list);
-HYD_Status HYDU_alloc_proxy_segment(struct HYD_Proxy_segment **segment);
-HYD_Status HYDU_merge_proxy_segment(char *name, struct HYD_Proxy_segment *segment,
- struct HYD_Proxy **proxy_list);
-HYD_Status HYDU_alloc_proxy_exec(struct HYD_Proxy_exec **exec);
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);
@@ -180,10 +178,13 @@
struct HYD_Thread_context *ctxt);
HYD_Status HYDU_join_thread(struct HYD_Thread_context ctxt);
#endif /* HAVE_THREAD_SUPPORT */
+
+/* others */
+HYD_Status HYDU_merge_proxy_segment(char *name, struct HYD_Proxy_segment *segment,
+ struct HYD_Proxy **proxy_list);
int HYDU_local_to_global_id(int local_id, int core_count,
struct HYD_Proxy_segment *segment_list, int global_core_count);
-
/* signals */
#ifdef NEEDS_POSIX_FOR_SIGACTION
#define _POSIX_SOURCE
@@ -202,7 +203,6 @@
HYD_Status HYDU_set_signal(int signum, void (*handler) (int));
HYD_Status HYDU_set_common_signals(void (*handler) (int));
-
/* Sock utilities */
enum HYDU_sock_comm_flag {
HYDU_SOCK_COMM_MSGWAIT = 0x01
@@ -223,7 +223,6 @@
HYD_Status HYDU_sock_stdin_cb(int fd, HYD_Event_t events, int stdin_fd, char *buf,
int *buf_count, int *buf_offset, int *closed);
-
/* Memory utilities */
#include <ctype.h>
@@ -282,7 +281,6 @@
int HYDU_strlist_lastidx(char **strlist);
char **HYDU_str_to_strlist(char *str);
-
/* Timer utilities */
/* FIXME: HYD_Time should be OS specific */
#ifdef HAVE_TIME
@@ -292,11 +290,10 @@
void HYDU_time_set(HYD_Time * time, int *val);
int HYDU_time_left(HYD_Time start, HYD_Time timeout);
-
/* checkpointing */
HYD_Status HYDU_ckpoint_init(char *ckpointlib, char *ckpoint_prefix);
HYD_Status HYDU_ckpoint_suspend(void);
-HYD_Status HYDU_ckpoint_restart(HYD_Env_t *envlist, int num_ranks, int ranks[], int *in, int *out, int *err);
+HYD_Status HYDU_ckpoint_restart(HYD_Env_t *envlist, int num_ranks, int ranks[], int *in,
+ int *out, int *err);
-
#endif /* HYDRA_UTILS_H_INCLUDED */
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-14 11:35:56 UTC (rev 5457)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_proxy_utils.c 2009-10-14 11:36:00 UTC (rev 5458)
@@ -15,38 +15,13 @@
{
HYD_Status status = HYD_SUCCESS;
- HYD_PMCD_pmi_proxy_params.user_global.bootstrap = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.bootstrap_exec = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.launch_mode = HYD_LAUNCH_UNSET;
+ HYDU_init_user_global(&HYD_PMCD_pmi_proxy_params.user_global);
- HYD_PMCD_pmi_proxy_params.upstream.server_name = NULL;
- HYD_PMCD_pmi_proxy_params.upstream.server_port = -1;
- HYD_PMCD_pmi_proxy_params.local.id = -1;
- HYD_PMCD_pmi_proxy_params.user_global.debug = 0;
- HYD_PMCD_pmi_proxy_params.user_global.enablex = -1;
-
- HYD_PMCD_pmi_proxy_params.user_global.wdir = NULL;
+ HYD_PMCD_pmi_proxy_params.system_global.global_core_count = 0;
HYD_PMCD_pmi_proxy_params.system_global.pmi_port_str = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.binding = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.bindlib = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.ckpointlib = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.ckpoint_prefix = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.ckpoint_restart = 0;
-
- HYD_PMCD_pmi_proxy_params.user_global.global_env.system = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.global_env.user = NULL;
- HYD_PMCD_pmi_proxy_params.user_global.global_env.inherited = NULL;
-
- HYD_PMCD_pmi_proxy_params.system_global.global_core_count = 0;
- HYD_PMCD_pmi_proxy_params.local.core_count = 0;
- HYD_PMCD_pmi_proxy_params.local.process_count = 0;
-
- HYD_PMCD_pmi_proxy_params.local.procs_are_launched = 0;
-
- HYD_PMCD_pmi_proxy_params.segment_list = NULL;
- HYD_PMCD_pmi_proxy_params.exec_list = NULL;
-
+ HYD_PMCD_pmi_proxy_params.upstream.server_name = NULL;
+ HYD_PMCD_pmi_proxy_params.upstream.server_port = -1;
HYD_PMCD_pmi_proxy_params.upstream.out = -1;
HYD_PMCD_pmi_proxy_params.upstream.err = -1;
HYD_PMCD_pmi_proxy_params.upstream.in = -1;
@@ -58,10 +33,17 @@
HYD_PMCD_pmi_proxy_params.downstream.pid = NULL;
HYD_PMCD_pmi_proxy_params.downstream.exit_status = NULL;
+ HYD_PMCD_pmi_proxy_params.local.id = -1;
+ HYD_PMCD_pmi_proxy_params.local.core_count = 0;
+ HYD_PMCD_pmi_proxy_params.local.process_count = 0;
+ HYD_PMCD_pmi_proxy_params.local.procs_are_launched = 0;
HYD_PMCD_pmi_proxy_params.local.stdin_buf_offset = 0;
HYD_PMCD_pmi_proxy_params.local.stdin_buf_count = 0;
HYD_PMCD_pmi_proxy_params.local.stdin_tmp_buf[0] = '\0';
+ HYD_PMCD_pmi_proxy_params.segment_list = NULL;
+ HYD_PMCD_pmi_proxy_params.exec_list = NULL;
+
return status;
}
Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-14 11:35:56 UTC (rev 5457)
+++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2009-10-14 11:36:00 UTC (rev 5458)
@@ -10,36 +10,22 @@
void HYD_UIU_init_params(void)
{
+ HYDU_init_user_global(&HYD_handle.user_global);
+
HYD_handle.base_path = NULL;
HYD_handle.proxy_port = -1;
- HYD_handle.user_global.launch_mode = HYD_LAUNCH_UNSET;
- HYD_handle.user_global.bootstrap = NULL;
HYD_handle.css = NULL;
HYD_handle.rmk = NULL;
- HYD_handle.user_global.binding = NULL;
- HYD_handle.user_global.bindlib = NULL;
- HYD_handle.user_global.ckpointlib = NULL;
HYD_handle.ckpoint_int = -1;
- HYD_handle.user_global.ckpoint_prefix = NULL;
- HYD_handle.user_global.ckpoint_restart = 0;
- HYD_handle.user_global.debug = -1;
HYD_handle.print_rank_map = -1;
HYD_handle.print_all_exitcodes = -1;
- HYD_handle.user_global.enablex = -1;
HYD_handle.pm_env = -1;
- HYD_handle.user_global.wdir = NULL;
HYD_handle.ranks_per_proc = -1;
- HYD_handle.user_global.bootstrap_exec = NULL;
- HYD_handle.user_global.global_env.inherited = NULL;
- HYD_handle.user_global.global_env.system = NULL;
- HYD_handle.user_global.global_env.user = NULL;
- HYD_handle.user_global.global_env.prop = NULL;
-
HYD_handle.stdin_cb = NULL;
HYD_handle.stdout_cb = NULL;
HYD_handle.stderr_cb = NULL;
Modified: mpich2/trunk/src/pm/hydra/utils/alloc/alloc.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/alloc/alloc.c 2009-10-14 11:35:56 UTC (rev 5457)
+++ mpich2/trunk/src/pm/hydra/utils/alloc/alloc.c 2009-10-14 11:36:00 UTC (rev 5458)
@@ -6,6 +6,34 @@
#include "hydra_utils.h"
+void HYDU_init_user_global(struct HYD_User_global *user_global)
+{
+ user_global->bootstrap = NULL;
+ user_global->bootstrap_exec = NULL;
+
+ user_global->binding = NULL;
+ user_global->bindlib = NULL;
+
+ user_global->ckpointlib = NULL;
+ user_global->ckpoint_prefix = NULL;
+ user_global->ckpoint_restart = 0;
+
+ user_global->enablex = -1;
+ user_global->debug = -1;
+ user_global->wdir = NULL;
+ user_global->launch_mode = HYD_LAUNCH_UNSET;
+
+ HYDU_init_global_env(&user_global->global_env);
+}
+
+void HYDU_init_global_env(struct HYD_Env_global *global_env)
+{
+ global_env->system = NULL;
+ global_env->user = NULL;
+ global_env->inherited = NULL;
+ global_env->prop = NULL;
+}
+
HYD_Status HYDU_alloc_proxy(struct HYD_Proxy **proxy)
{
static int proxy_id = 0;
More information about the mpich2-commits
mailing list