[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.2-7-g9bd821e

[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  9bd821e448f445ad4a75f7f487144d11656937de (commit)
       via  5bf85455a6853410d43fc6e363f2451a54a5c7cd (commit)
      from  39fe32a8b0a6476d80cf11142d4010e40e8da4ce (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/9bd821e448f445ad4a75f7f487144d11656937de

commit 9bd821e448f445ad4a75f7f487144d11656937de
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Jul 22 15:52:51 2014 -0500

    portals4: correct MPIU_Assert conditional
    
    When making progress on a large send, the source will see events of
    type PTL_EVENT_GET or PTL_EVENT_ACK, indicating completion of operations
    at the target. This assertion incorrectly failed on PTL_EVENT_GET,
    probably from a copy/paste error from the above "if" statement.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
index 59bcd3e..ae2120a 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
@@ -56,7 +56,7 @@ static int handler_large(const ptl_event_t *e)
         MPIU_Error_printf("ACK event expected, received %s ni_fail=%s list=%s user_ptr=%p hdr_data=%#lx\n",
                           MPID_nem_ptl_strevent(e), MPID_nem_ptl_strnifail(e->ni_fail_type),
                           MPID_nem_ptl_strlist(e->ptl_list), e->user_ptr, e->hdr_data);
-    MPIU_Assert(e->type == PTL_EVENT_ACK || e->type != PTL_EVENT_GET);
+    MPIU_Assert(e->type == PTL_EVENT_ACK || e->type == PTL_EVENT_GET);
     
     if (e->type == PTL_EVENT_ACK && e->mlength < PTL_LARGE_THRESHOLD) {
         /* truncated message */

http://git.mpich.org/mpich.git/commitdiff/5bf85455a6853410d43fc6e363f2451a54a5c7cd

commit 5bf85455a6853410d43fc6e363f2451a54a5c7cd
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Jul 22 15:27:18 2014 -0500

    portals4: swap arguments to MPIU_Memcpy
    
    Source and destination were in the wrong order. In large contiguous
    messages, the first chunk of target buffer was not updated.
    
    Signed-off-by: Pavan Balaji <balaji at 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 0ccb937..6760165 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
@@ -204,7 +204,7 @@ static int handler_recv_dequeue_large(const ptl_event_t *e)
     /* unpack data from unexpected buffer first */
     if (e->type == PTL_EVENT_PUT_OVERFLOW) {
         if (dt_contig) {
-            MPIU_Memcpy(e->start, rreq->dev.user_buf, e->mlength);
+            MPIU_Memcpy(rreq->dev.user_buf, e->start, e->mlength);
         } else {
             rreq->dev.segment_first = 0;
             last = e->mlength;

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

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


hooks/post-receive
-- 
MPICH primary repository