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 1dc5b1a50233fb7d22490daceaa36f596b49f357 (commit) from e51b9c63dfa28d5dfd786d1f4ce21e51be0fc2fb (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/1dc5b1a50233fb7d22490daceaa36f596b... commit 1dc5b1a50233fb7d22490daceaa36f596b49f357 Author: Charles J Archer <[email protected]> Date: Tue Jun 23 21:41:43 2015 -0700 Progress registration fixup for pamid device Signed-off-by: Junchao Zhang <[email protected]> diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c index 52304e1..13c828e 100644 --- a/src/mpid/common/sched/mpid_sched.c +++ b/src/mpid/common/sched/mpid_sched.c @@ -944,7 +944,7 @@ int MPIDU_Sched_progress(int *made_progress) mpi_errno = MPIDU_Sched_progress_state(&all_schedules, made_progress); if (!mpi_errno && all_schedules.head == NULL) - MPIDI_CH3I_Progress_deregister_hook(MPIDU_Sched_progress); + MPID_Progress_deregister_hook(MPIDU_Sched_progress); return mpi_errno; } diff --git a/src/mpid/pamid/src/mpid_progress.c b/src/mpid/pamid/src/mpid_progress.c index 17191ff..1b6df50 100644 --- a/src/mpid/pamid/src/mpid_progress.c +++ b/src/mpid/pamid/src/mpid_progress.c @@ -26,7 +26,7 @@ typedef int (*progress_func_ptr_t) (int* made_progress); static progress_func_ptr_t progress_hooks[MAX_PROGRESS_HOOKS] = { NULL }; #undef FUNCNAME -#define FUNCNAME MPIDI_CH3I_Progress_register_hook +#define FUNCNAME MPIDI_Progress_register_hook #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPIDI_Progress_register_hook(int (*progress_fn)(int*)) @@ -61,10 +61,10 @@ int MPIDI_Progress_register_hook(int (*progress_fn)(int*)) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH3I_Progress_deregister_hook +#define FUNCNAME MPIDI_Progress_deregister_hook #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_CH3I_Progress_deregister_hook(int (*progress_fn)(int*)) +int MPIDI_Progress_deregister_hook(int (*progress_fn)(int*)) { int mpi_errno = MPI_SUCCESS; int i; ----------------------------------------------------------------------- Summary of changes: src/mpid/common/sched/mpid_sched.c | 2 +- src/mpid/pamid/src/mpid_progress.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository