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 0b2c485f02706c5988b878dc69dd350794847ff4 (commit) from c0c907017064a8eceb9b46116a9c91b906634bdf (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/0b2c485f02706c5988b878dc69dd350794... commit 0b2c485f02706c5988b878dc69dd350794847ff4 Author: Pavan Balaji <[email protected]> Date: Sat Feb 6 15:15:56 2016 -0600 fix wrong placement of MPID functionality. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index f6959ad..e34aac1 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1857,14 +1857,4 @@ int MPIDI_CH3_Req_handler_rma_op_complete(MPIR_Request *); } while (0) -int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*), int *id); -int MPIDI_CH3I_Progress_deregister_hook(int id); -int MPIDI_CH3I_Progress_activate_hook(int id); -int MPIDI_CH3I_Progress_deactivate_hook(int id); - -#define MPID_Progress_register_hook(fn_, id_) MPIDI_CH3I_Progress_register_hook(fn_, id_) -#define MPID_Progress_deregister_hook(id_) MPIDI_CH3I_Progress_deregister_hook(id_) -#define MPID_Progress_activate_hook(id_) MPIDI_CH3I_Progress_activate_hook(id_) -#define MPID_Progress_deactivate_hook(id_) MPIDI_CH3I_Progress_deactivate_hook(id_) - #endif /* !defined(MPICH_MPIDIMPL_H_INCLUDED) */ diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index be5edb4..bc7a7f9 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -194,4 +194,14 @@ int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, int MPIDI_CH3I_Comm_create_hook(struct MPIR_Comm *); int MPIDI_CH3I_Comm_destroy_hook(struct MPIR_Comm *); +int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*), int *id); +int MPIDI_CH3I_Progress_deregister_hook(int id); +int MPIDI_CH3I_Progress_activate_hook(int id); +int MPIDI_CH3I_Progress_deactivate_hook(int id); + +#define MPID_Progress_register_hook(fn_, id_) MPIDI_CH3I_Progress_register_hook(fn_, id_) +#define MPID_Progress_deregister_hook(id_) MPIDI_CH3I_Progress_deregister_hook(id_) +#define MPID_Progress_activate_hook(id_) MPIDI_CH3I_Progress_activate_hook(id_) +#define MPID_Progress_deactivate_hook(id_) MPIDI_CH3I_Progress_deactivate_hook(id_) + #endif /* !defined(MPIDPOST_H_INCLUDED) */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidimpl.h | 10 ---------- src/mpid/ch3/include/mpidpost.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository