[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2rc1-2-gab86ff3

[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  ab86ff374c430a00ee9065e8b1b95df27087f204 (commit)
      from  47d30d22835cfbd93658ddcfa4aff4c5d53a7978 (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/ab86ff374c430a00ee9065e8b1b95df27087f204

commit ab86ff374c430a00ee9065e8b1b95df27087f204
Author: Lena Oden <loden at anl.gov>
Date:   Fri Oct 16 13:49:22 2015 -0500

    netmod/mxm: mask error bits for tags
    
    This patch masks out the error bits for tag matching in the mxm network.
    Otherwise, the messages can not be matched if the error flags are set,
    which results in a deadlock.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
index 2e9eba5..b717382 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
@@ -316,7 +316,7 @@ static inline int _mxm_tag_mxm2mpi(mxm_tag_t mxm_tag)
 
 static inline mxm_tag_t _mxm_tag_mask(int mpi_tag)
 {
-    return (mpi_tag == MPI_ANY_TAG ? 0x80000000U : 0xffffffffU);
+    return (mpi_tag == MPI_ANY_TAG ? 0x80000000U : ~(MPIR_TAG_PROC_FAILURE_BIT | MPIR_TAG_ERROR_BIT));
 }
 
 /*

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

Summary of changes:
 .../ch3/channels/nemesis/netmod/mxm/mxm_impl.h     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository