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 6dff3b96066195508406bea51ee551060a4f6fad (commit) from d12700f614e37299752c7750a73c273fdb6bdfcc (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/6dff3b96066195508406bea51ee551060a... commit 6dff3b96066195508406bea51ee551060a4f6fad Author: Pavan Balaji <[email protected]> Date: Thu Aug 21 15:24:05 2014 -0500 Fix state declarations in netmods. No reviewer. diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c index 7523127..8c84026 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c @@ -642,6 +642,9 @@ int MPID_nem_ib_handle_pkt_bh(MPIDI_VC_t * vc, MPID_Request * req, char *buf, MP int mpi_errno = MPI_SUCCESS; int complete = 0; + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_IB_HANDLE_PKT_BH); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_IB_HANDLE_PKT_BH); + while (buflen && !complete) { MPID_IOV *iov; int n_iov; @@ -691,7 +694,7 @@ int MPID_nem_ib_handle_pkt_bh(MPIDI_VC_t * vc, MPID_Request * req, char *buf, MP } } fn_exit: - MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_IB_DRAIN_SCQ); + MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_IB_HANDLE_PKT_BH); return mpi_errno; fn_fail: goto fn_exit; @@ -1794,6 +1797,9 @@ int MPID_nem_ib_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_Win *win_ptr; + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_IB_PKTHANDLER_PUT); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_IB_PKTHANDLER_PUT); + MPIU_Assert(put_pkt->target_win_handle != MPI_WIN_NULL); MPID_Win_get_ptr(put_pkt->target_win_handle, win_ptr); mpi_errno = MPIDI_CH3_Start_rma_op_target(win_ptr, put_pkt->flags); @@ -1911,6 +1917,9 @@ int MPID_nem_ib_PktHandler_Accumulate(MPIDI_VC_t * vc, MPI_Aint type_size; MPID_Win *win_ptr; + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_IB_PKTHANDLER_ACCUMULATE); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_IB_PKTHANDLER_ACCUMULATE); + MPIU_Assert(accum_pkt->target_win_handle != MPI_WIN_NULL); MPID_Win_get_ptr(accum_pkt->target_win_handle, win_ptr); mpi_errno = MPIDI_CH3_Start_rma_op_target(win_ptr, accum_pkt->flags); @@ -2093,6 +2102,10 @@ int MPID_nem_ib_PktHandler_GetResp(MPIDI_VC_t * vc, MPID_nem_ib_rma_lmt_cookie_t *s_cookie_buf = (MPID_nem_ib_rma_lmt_cookie_t *) ((uint8_t *) pkt + sizeof(MPIDI_CH3_Pkt_t) + sizeof(MPIDI_CH3_Pkt_t)); + + MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_IB_PKTHANDLER_GETRESP); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_IB_PKTHANDLER_GETRESP); + MPID_Request_get_ptr(get_resp_pkt->request_handle, req); void *write_to_buf; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 3e60d56..5371625 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -129,7 +129,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, MPIDI_msg_sz_t hdr_ fn_exit: *sreq_ptr = sreq; - MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_MX_ISTARTCONTIGMSG); + MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_MXM_ISTARTCONTIGMSG); return mpi_errno; fn_fail: goto fn_exit; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 15 ++++++++++++++- .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository