[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-200-g198d291

[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  198d29175ff3ac40c96f22edde01fa247c405567 (commit)
      from  f953564369f6c22a95fa3f9ccb31ca1c7f0a034a (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/198d29175ff3ac40c96f22edde01fa247c405567

commit 198d29175ff3ac40c96f22edde01fa247c405567
Author: Pavan Balaji <balaji at anl.gov>
Date:   Thu Nov 13 09:36:30 2014 -0600

    Fix rportals bug when ACK not requested
    
    The user pointer was set, but later overwritten with an internal value.
    
    Signed-off-by: Antonio Pena Monferrer <apenya at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
index 4de135c..cbcc81c 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
@@ -1186,6 +1186,11 @@ int MPID_nem_ptl_rptl_eqget(ptl_handle_eq_t eq_handle, ptl_event_t * event)
             else if (!(op->u.put.ack_req & PTL_ACK_REQ)) {
                 memcpy(event, op->u.put.send, sizeof(ptl_event_t));
                 MPIU_Free(op->u.put.send);
+
+                /* set the event user pointer again, since we copied
+                 * over the original event */
+                event->user_ptr = op->u.put.user_ptr;
+
                 /* we should be in the data op list */
                 MPL_DL_DELETE(op->target->data_op_list, op);
                 free_op(op);

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

Summary of changes:
 .../ch3/channels/nemesis/netmod/portals4/rptl.c    |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
MPICH primary repository