[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-12-gc38c3c7

[Service Account]

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  c38c3c798119fad98ed5dcacc4d0a27ffb93a449 (commit)
      from  81beb085d958566b9c6ce9bb2da57f002543c786 (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/c38c3c798119fad98ed5dcacc4d0a27ffb93a449

commit c38c3c798119fad98ed5dcacc4d0a27ffb93a449
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Jun 8 16:56:21 2015 -0500

    netmod/portals4: fix bug in setting count
    
    Truncated message counts were incorrectly overwritten with the full
    message size. Closes #2260.
    
    Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
index 76bb7ea..fcc6184 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
@@ -40,9 +40,9 @@ static void dequeue_req(const ptl_event_t *e)
         /* truncated data */
         MPIR_STATUS_SET_COUNT(rreq->status, r_len);
         MPIU_ERR_SET2(rreq->status.MPI_ERROR, MPI_ERR_TRUNCATE, "**truncate", "**truncate %d %d", s_len, r_len);
+    } else {
+        MPIR_STATUS_SET_COUNT(rreq->status, s_len);
     }
-    
-    MPIR_STATUS_SET_COUNT(rreq->status, s_len);
 }
 
 #undef FUNCNAME

-----------------------------------------------------------------------

Summary of changes:
 .../channels/nemesis/netmod/portals4/ptl_recv.c    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository