[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b1-81-g4ef8d55

[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  4ef8d551fdaa38e636927cd38805d60fb13ede8d (commit)
      from  c89e8d8ef3f15facf9763cfba4bd7a1f30b5b16e (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/4ef8d551fdaa38e636927cd38805d60fb13ede8d

commit 4ef8d551fdaa38e636927cd38805d60fb13ede8d
Author: Charles J Archer <charles.j.archer at intel.com>
Date:   Mon Apr 20 12:22:07 2015 -0700

    OFI:  Fix multiple providers failing probe-unexp
    
    Update OFI netmod to match portals4 netmod anysource_matched semantics.

diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
index cc2048f..cdf5535 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
@@ -97,9 +97,9 @@ int MPID_nem_ofi_iprobe_impl(struct MPIDI_VC *vc,
       if (rreq_ptr) {
         MPIDI_CH3_Request_destroy(rreq);
         *rreq_ptr = NULL;
-        *flag = 0;
       }
       MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL);
+      *flag = 0;
       goto fn_exit;
     }
     MPIU_ERR_CHKANDJUMP4((ret < 0), mpi_errno, MPI_ERR_OTHER,
diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c
index c73f618..66b9130 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c
@@ -68,10 +68,9 @@ static inline int MPID_nem_ofi_recv_callback(cq_tagged_entry_t * wc, MPID_Reques
     /* ---------------------------------------------------- */
     rreq->status.MPI_ERROR = MPI_SUCCESS;
     rreq->status.MPI_SOURCE = get_source(wc->tag);
-    rreq->status.MPI_TAG = get_tag(wc->tag);
+    rreq->status.MPI_TAG    = get_tag(wc->tag);
     REQ_OFI(rreq)->req_started = 1;
     MPIR_STATUS_SET_COUNT(rreq->status, wc->len);
-
     if (REQ_OFI(rreq)->pack_buffer) {
         MPIDI_CH3U_Buffer_copy(REQ_OFI(rreq)->pack_buffer,
                                MPIR_STATUS_GET_COUNT(rreq->status),
@@ -388,7 +387,7 @@ void MPID_nem_ofi_anysource_posted(MPID_Request * rreq)
 #define FCNAME DECL_FUNC(MPID_nem_ofi_anysource_matched)
 int MPID_nem_ofi_anysource_matched(MPID_Request * rreq)
 {
-    int mpi_errno = FALSE;
+    int mpi_errno = TRUE;
     int ret;
     BEGIN_FUNC(FCNAME);
     /* ----------------------------------------------------- */
@@ -401,10 +400,7 @@ int MPID_nem_ofi_anysource_matched(MPID_Request * rreq)
         /* --------------------------------------------------- */
         /* Request cancelled:  cancel and complete the request */
         /* --------------------------------------------------- */
-        mpi_errno = TRUE;
-        MPIR_STATUS_SET_CANCEL_BIT(rreq->status, TRUE);
-        MPIR_STATUS_SET_COUNT(rreq->status, 0);
-        MPIDI_CH3U_Request_complete(rreq);
+        mpi_errno = FALSE;
     }
     END_FUNC(FCNAME);
     return mpi_errno;

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

Summary of changes:
 .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c |    2 +-
 .../ch3/channels/nemesis/netmod/ofi/ofi_tagged.c   |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
MPICH primary repository