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 5fb28f76adbf88aa5f27fcfbe9d0a48109d7a149 (commit) via 64448061554eec5831ef4aaed2d11c58f899f5ee (commit) via 61cedc328e0b932172329fcb1d9e8539b7a7dd45 (commit) from 0bf19e5964a1436b64a5408e25a84a9c84c57c10 (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/5fb28f76adbf88aa5f27fcfbe9d0a48109... commit 5fb28f76adbf88aa5f27fcfbe9d0a48109d7a149 Author: Xin Zhao <[email protected]> Date: Mon Aug 3 23:57:41 2015 -0500 Delete redundant function definitions. MPIDI_CH3I_RMA_Ops_append and MPIDI_CH3I_RMA_Ops_unlink are essentially MPL_DL_APPEND and MPL_DL_DELETE. Here we delete them and directly use MPL macros. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/include/mpid_rma_oplist.h b/src/mpid/ch3/include/mpid_rma_oplist.h index 1702f45..4961571 100644 --- a/src/mpid/ch3/include/mpid_rma_oplist.h +++ b/src/mpid/ch3/include/mpid_rma_oplist.h @@ -593,36 +593,6 @@ static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e) } -/* Append an element to the tail of the RMA ops list - * - * @param IN list Pointer to the RMA ops list - * @param IN elem Pointer to the element to be appended - */ -#undef FUNCNAME -#define FUNCNAME MPIDI_CH3I_RMA_Ops_append -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) -{ - MPL_DL_APPEND(*list, elem); -} - - -/* Unlink an element from the RMA ops list - * - * @param IN list Pointer to the RMA ops list - * @param IN elem Pointer to the element to be unlinked - */ -#undef FUNCNAME -#define FUNCNAME MPIDI_CH3I_RMA_Ops_unlink -#undef FCNAME -#define FCNAME MPIU_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * elem) -{ - MPL_DL_DELETE(*list, elem); -} - - /* Free an element in the RMA operations list. * * @param IN list Pointer to the RMA ops list diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index f2d1988..05d563a 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -705,8 +705,8 @@ static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Tar MPIU_ERR_POP(mpi_errno); } - MPIDI_CH3I_RMA_Ops_unlink(&(target->pending_net_ops_list_head), rma_op); - MPIDI_CH3I_RMA_Ops_append(list_ptr, rma_op); + MPL_DL_DELETE(target->pending_net_ops_list_head, rma_op); + MPL_DL_APPEND((*list_ptr), rma_op); win_ptr->active_req_cnt += rma_op->ref_cnt; } http://git.mpich.org/mpich.git/commitdiff/64448061554eec5831ef4aaed2d11c58f8... commit 64448061554eec5831ef4aaed2d11c58f899f5ee Author: Xin Zhao <[email protected]> Date: Mon Aug 3 23:32:35 2015 -0500 Release the request after modifying the attributes of it. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 408e724..f2d1988 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -671,7 +671,6 @@ static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Tar (*req) = NULL; } else { - MPID_Request_release((*req)); (*req)->request_completed_cb = MPIDI_CH3_Req_handler_rma_op_complete; (*req)->dev.source_win_handle = win_ptr->handle; (*req)->dev.rma_op_ptr = rma_op; @@ -682,6 +681,8 @@ static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Tar MPID_cc_set(&(rma_op->ureq->cc), rma_op->ref_cnt); (*req)->dev.request_handle = rma_op->ureq->handle; } + + MPID_Request_release((*req)); } } http://git.mpich.org/mpich.git/commitdiff/61cedc328e0b932172329fcb1d9e8539b7... commit 61cedc328e0b932172329fcb1d9e8539b7a7dd45 Author: Xin Zhao <[email protected]> Date: Mon Aug 3 23:31:50 2015 -0500 Delete useless if branch. Condition in if branch and following for loop are redundant. Here we delete the if branch. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 3b5a70c..408e724 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -657,32 +657,30 @@ static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Tar (*op_completed) = FALSE; - if (rma_op->reqs_size > 0) { - for (i = 0; i < rma_op->reqs_size; i++) { - if (rma_op->reqs_size == 1) - req = &(rma_op->single_req); - else - req = &(rma_op->multi_reqs[i]); - - if ((*req) == NULL) - continue; + for (i = 0; i < rma_op->reqs_size; i++) { + if (rma_op->reqs_size == 1) + req = &(rma_op->single_req); + else + req = &(rma_op->multi_reqs[i]); - if (MPID_Request_is_complete((*req))) { - MPID_Request_release((*req)); - (*req) = NULL; - } - else { - MPID_Request_release((*req)); - (*req)->request_completed_cb = MPIDI_CH3_Req_handler_rma_op_complete; - (*req)->dev.source_win_handle = win_ptr->handle; - (*req)->dev.rma_op_ptr = rma_op; + if ((*req) == NULL) + continue; - rma_op->ref_cnt++; + if (MPID_Request_is_complete((*req))) { + MPID_Request_release((*req)); + (*req) = NULL; + } + else { + MPID_Request_release((*req)); + (*req)->request_completed_cb = MPIDI_CH3_Req_handler_rma_op_complete; + (*req)->dev.source_win_handle = win_ptr->handle; + (*req)->dev.rma_op_ptr = rma_op; - if (rma_op->ureq != NULL) { - MPID_cc_set(&(rma_op->ureq->cc), rma_op->ref_cnt); - (*req)->dev.request_handle = rma_op->ureq->handle; - } + rma_op->ref_cnt++; + + if (rma_op->ureq != NULL) { + MPID_cc_set(&(rma_op->ureq->cc), rma_op->ref_cnt); + (*req)->dev.request_handle = rma_op->ureq->handle; } } } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_rma_oplist.h | 30 ------------------ src/mpid/ch3/include/mpidrma.h | 51 +++++++++++++++---------------- 2 files changed, 25 insertions(+), 56 deletions(-) hooks/post-receive -- MPICH primary repository