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 57e4f7568347705d1715e6ffd57788836af76e27 (commit) from b01c4038de97e937c1540b1d5444f11d87d1851a (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/57e4f7568347705d1715e6ffd57788836a... commit 57e4f7568347705d1715e6ffd57788836af76e27 Author: Xin Zhao <[email protected]> Date: Sun May 31 10:23:40 2015 -0500 Bug-fix: issue extended packet header in sock. Originally we add extended packet header for RMA packets and issue it from Nemesis and netmods, unfortunately we forgot to modify Sock channel. This patch fixes this problem. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/mpid/ch3/channels/sock/src/ch3_isendv.c b/src/mpid/ch3/channels/sock/src/ch3_isendv.c index 8d0fcf4..c66fede 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_isendv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_isendv.c @@ -50,6 +50,17 @@ int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPID_Request * sreq, MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_ISENDV); + if (sreq->dev.ext_hdr_sz > 0) { + int i; + for (i = n_iov-1; i >= 1; i--) { + iov[i+1].MPID_IOV_BUF = iov[i].MPID_IOV_BUF; + iov[i+1].MPID_IOV_LEN = iov[i].MPID_IOV_LEN; + } + iov[1].MPID_IOV_BUF = (MPID_IOV_BUF_CAST) sreq->dev.ext_hdr_ptr; + iov[1].MPID_IOV_LEN = sreq->dev.ext_hdr_sz; + n_iov++; + } + MPIU_Assert(n_iov <= MPID_IOV_LIMIT); MPIU_Assert(iov[0].MPID_IOV_LEN <= sizeof(MPIDI_CH3_Pkt_t)); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/sock/src/ch3_isendv.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository