This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6b4405ef1d44d766299594d8a5e92332735252af (commit) from 0631718f8dc25304c62f0ac755e46f38256eb880 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6b4405ef1d44d766299594d8a5e9233273... commit 6b4405ef1d44d766299594d8a5e92332735252af Author: artem.v.yalozo <[email protected]> Date: Mon May 5 18:33:39 2014 +0400 Hydra Windows Compilation: Distinguish struct and variable names * Fix compilation errors with the Windows compiler * Allow correct debugging of data structures Signed-off-by: Huiwei Lu <[email protected]> diff --git a/src/pm/hydra/include/hydra_server.h b/src/pm/hydra/include/hydra_server.h index 806896c..2299d2b 100644 --- a/src/pm/hydra/include/hydra_server.h +++ b/src/pm/hydra/include/hydra_server.h @@ -20,7 +20,7 @@ struct HYD_cmd { int signum; }; -struct HYD_server_info { +struct HYD_server_info_s { struct HYD_user_global user_global; char *base_path; @@ -47,6 +47,6 @@ struct HYD_server_info { #endif /* ENABLE_PROFILING */ }; -extern struct HYD_server_info HYD_server_info; +extern struct HYD_server_info_s HYD_server_info; #endif /* HYDRA_SERVER_H_INCLUDED */ diff --git a/src/pm/hydra/pm/pmiserv/pmip.c b/src/pm/hydra/pm/pmiserv/pmip.c index 9c90f7c..32c15e4 100644 --- a/src/pm/hydra/pm/pmiserv/pmip.c +++ b/src/pm/hydra/pm/pmiserv/pmip.c @@ -11,7 +11,7 @@ #include "topo.h" #include "hydt_ftb.h" -struct HYD_pmcd_pmip HYD_pmcd_pmip; +struct HYD_pmcd_pmip_s HYD_pmcd_pmip; static HYD_status init_params(void) { diff --git a/src/pm/hydra/pm/pmiserv/pmip.h b/src/pm/hydra/pm/pmiserv/pmip.h index 977f5f8..e0e2536 100644 --- a/src/pm/hydra/pm/pmiserv/pmip.h +++ b/src/pm/hydra/pm/pmiserv/pmip.h @@ -17,7 +17,7 @@ struct HYD_pmcd_pmip_map { int total; }; -struct HYD_pmcd_pmip { +struct HYD_pmcd_pmip_s { struct HYD_user_global user_global; struct { @@ -86,7 +86,7 @@ struct HYD_pmcd_pmip { struct HYD_exec *exec_list; }; -extern struct HYD_pmcd_pmip HYD_pmcd_pmip; +extern struct HYD_pmcd_pmip_s HYD_pmcd_pmip; extern struct HYD_arg_match_table HYD_pmcd_pmip_match_table[]; HYD_status HYD_pmcd_pmip_get_params(char **t_argv); diff --git a/src/pm/hydra/tools/bootstrap/external/pbs.h b/src/pm/hydra/tools/bootstrap/external/pbs.h index f5c0be0..bf846ab 100644 --- a/src/pm/hydra/tools/bootstrap/external/pbs.h +++ b/src/pm/hydra/tools/bootstrap/external/pbs.h @@ -12,13 +12,13 @@ #if defined(HAVE_TM_H) #include "tm.h" -struct HYDT_bscd_pbs_sys { +struct HYDT_bscd_pbs_sys_s { int spawn_count; tm_event_t *spawn_events; tm_task_id *task_id; /* Array of TM task(process) IDs */ }; -extern struct HYDT_bscd_pbs_sys *HYDT_bscd_pbs_sys; +extern struct HYDT_bscd_pbs_sys_s *HYDT_bscd_pbs_sys; HYD_status HYDT_bscd_pbs_launch_procs(char **args, struct HYD_proxy *proxy_list, int *control_fd); HYD_status HYDT_bscd_pbs_query_env_inherit(const char *env_name, int *ret); diff --git a/src/pm/hydra/tools/bootstrap/external/pbs_init.c b/src/pm/hydra/tools/bootstrap/external/pbs_init.c index 9a92e76..4bbbc0b 100644 --- a/src/pm/hydra/tools/bootstrap/external/pbs_init.c +++ b/src/pm/hydra/tools/bootstrap/external/pbs_init.c @@ -9,7 +9,7 @@ #include "pbs.h" #if defined(HAVE_TM_H) -struct HYDT_bscd_pbs_sys *HYDT_bscd_pbs_sys; +struct HYDT_bscd_pbs_sys_s *HYDT_bscd_pbs_sys; HYD_status HYDT_bsci_launcher_pbs_init(void) { @@ -24,8 +24,8 @@ HYD_status HYDT_bsci_launcher_pbs_init(void) HYDT_bsci_fns.wait_for_completion = HYDT_bscd_pbs_wait_for_completion; HYDT_bsci_fns.launcher_finalize = HYDT_bscd_pbs_launcher_finalize; - HYDU_MALLOC(HYDT_bscd_pbs_sys, struct HYDT_bscd_pbs_sys *, - sizeof(struct HYDT_bscd_pbs_sys), status); + HYDU_MALLOC(HYDT_bscd_pbs_sys, struct HYDT_bscd_pbs_sys_s *, + sizeof(struct HYDT_bscd_pbs_sys_s), status); /* Initialize TM and Hydra's PBS data structure */ err = tm_init(NULL, &tm_root); diff --git a/src/pm/hydra/tools/bootstrap/persist/persist_server.c b/src/pm/hydra/tools/bootstrap/persist/persist_server.c index ea71198..1a12121 100644 --- a/src/pm/hydra/tools/bootstrap/persist/persist_server.c +++ b/src/pm/hydra/tools/bootstrap/persist/persist_server.c @@ -8,7 +8,7 @@ #include "topo.h" #include "persist_server.h" -struct HYDT_persist_handle HYDT_persist_handle; +struct HYDT_persist_handle_s HYDT_persist_handle; static struct { enum { MASTER, diff --git a/src/pm/hydra/tools/bootstrap/persist/persist_server.h b/src/pm/hydra/tools/bootstrap/persist/persist_server.h index 95e98cc..03c54a5 100644 --- a/src/pm/hydra/tools/bootstrap/persist/persist_server.h +++ b/src/pm/hydra/tools/bootstrap/persist/persist_server.h @@ -11,11 +11,11 @@ #include "demux.h" #include "persist.h" -struct HYDT_persist_handle { +struct HYDT_persist_handle_s { int port; /* port to listen on */ int debug; /* Run in debug mode */ }; -extern struct HYDT_persist_handle HYDT_persist_handle; +extern struct HYDT_persist_handle_s HYDT_persist_handle; #endif /* PERSIST_SERVER_H_INCLUDED */ diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.c b/src/pm/hydra/tools/ckpoint/ckpoint.c index 8f8d253..82da0a3 100644 --- a/src/pm/hydra/tools/ckpoint/ckpoint.c +++ b/src/pm/hydra/tools/ckpoint/ckpoint.c @@ -19,7 +19,7 @@ static pthread_t thread; #endif static enum { HYDT_CKPOINT_NONE, HYDT_CKPOINT_RUNNING, HYDT_CKPOINT_FINISHED } in_ckpt; -struct HYDT_ckpoint_info HYDT_ckpoint_info; +struct HYDT_ckpoint_info_s HYDT_ckpoint_info; HYD_status HYDT_ckpoint_init(const char *user_ckpointlib, int user_ckpoint_num) { diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.h b/src/pm/hydra/tools/ckpoint/ckpoint.h index 55d3af6..bb99bf4 100644 --- a/src/pm/hydra/tools/ckpoint/ckpoint.h +++ b/src/pm/hydra/tools/ckpoint/ckpoint.h @@ -21,7 +21,7 @@ * Contains private persistent information stored by the checkpointing * library. */ -struct HYDT_ckpoint_info { +struct HYDT_ckpoint_info_s { /** \brief Checkpointing library to use */ const char *ckpointlib; const char *prefix; @@ -32,7 +32,7 @@ struct HYDT_ckpoint_info { }; /** \cond */ -extern struct HYDT_ckpoint_info HYDT_ckpoint_info; +extern struct HYDT_ckpoint_info_s HYDT_ckpoint_info; /** \endcond */ /** diff --git a/src/pm/hydra/ui/include/ui.h b/src/pm/hydra/ui/include/ui.h index 91f2401..a5e79c2 100644 --- a/src/pm/hydra/ui/include/ui.h +++ b/src/pm/hydra/ui/include/ui.h @@ -7,12 +7,12 @@ #ifndef UI_H_INCLUDED #define UI_H_INCLUDED -struct HYD_ui_info { +struct HYD_ui_info_s { char *prepend_pattern; char *outfile_pattern; char *errfile_pattern; }; -extern struct HYD_ui_info HYD_ui_info; +extern struct HYD_ui_info_s HYD_ui_info; #endif /* UI_H_INCLUDED */ diff --git a/src/pm/hydra/ui/mpich/mpiexec.c b/src/pm/hydra/ui/mpich/mpiexec.c index 39586b4..c07542f 100644 --- a/src/pm/hydra/ui/mpich/mpiexec.c +++ b/src/pm/hydra/ui/mpich/mpiexec.c @@ -14,11 +14,11 @@ #include "ui.h" #include "uiu.h" -struct HYD_server_info HYD_server_info = { {0} }; +struct HYD_server_info_s HYD_server_info = { {0} }; struct HYD_exec *HYD_uii_mpx_exec_list = NULL; -struct HYD_ui_info HYD_ui_info; -struct HYD_ui_mpich_info HYD_ui_mpich_info; +struct HYD_ui_info_s HYD_ui_info; +struct HYD_ui_mpich_info_s HYD_ui_mpich_info; static void signal_cb(int signum) { diff --git a/src/pm/hydra/ui/mpich/mpiexec.h b/src/pm/hydra/ui/mpich/mpiexec.h index 4127ce8..b761d92 100644 --- a/src/pm/hydra/ui/mpich/mpiexec.h +++ b/src/pm/hydra/ui/mpich/mpiexec.h @@ -9,7 +9,7 @@ #include "hydra_server.h" -struct HYD_ui_mpich_info { +struct HYD_ui_mpich_info_s { int ppn; int ckpoint_int; int print_all_exitcodes; @@ -21,7 +21,7 @@ struct HYD_ui_mpich_info { } sort_order; }; -extern struct HYD_ui_mpich_info HYD_ui_mpich_info; +extern struct HYD_ui_mpich_info_s HYD_ui_mpich_info; HYD_status HYD_uii_mpx_get_parameters(char **t_argv); ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/include/hydra_server.h | 4 ++-- src/pm/hydra/pm/pmiserv/pmip.c | 2 +- src/pm/hydra/pm/pmiserv/pmip.h | 4 ++-- src/pm/hydra/tools/bootstrap/external/pbs.h | 4 ++-- src/pm/hydra/tools/bootstrap/external/pbs_init.c | 6 +++--- .../hydra/tools/bootstrap/persist/persist_server.c | 2 +- .../hydra/tools/bootstrap/persist/persist_server.h | 4 ++-- src/pm/hydra/tools/ckpoint/ckpoint.c | 2 +- src/pm/hydra/tools/ckpoint/ckpoint.h | 4 ++-- src/pm/hydra/ui/include/ui.h | 4 ++-- src/pm/hydra/ui/mpich/mpiexec.c | 6 +++--- src/pm/hydra/ui/mpich/mpiexec.h | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository