[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-157-gcdd8e0b

[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  cdd8e0b7280d5a5bb0d1a2ae37d5d452954ef5b3 (commit)
      from  ffcc4904c225bbf1349d23e1099218de5287fe5a (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/cdd8e0b7280d5a5bb0d1a2ae37d5d452954ef5b3

commit cdd8e0b7280d5a5bb0d1a2ae37d5d452954ef5b3
Author: Wesley Bland <wbland at anl.gov>
Date:   Fri Apr 18 15:41:38 2014 -0500

    Makes sure that the status object is always defined
    
    In the MPIC_Sendrecv functions, the status object should always be defined
    since we use it internally. This won't have any impact on performance since
    the default is always to have FT collectives turned on anyway, but it will
    prevent a crash when someone overwrites that default.
    
    Fixes #2026
    
    Signed-off-by: Sangmin Seo <sseo at anl.gov>

diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c
index ac5ebf0..cf10a9e 100644
--- a/src/mpi/coll/helper_fns.c
+++ b/src/mpi/coll/helper_fns.c
@@ -458,10 +458,9 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
     context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
         MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
 
-    if (MPIR_CVAR_ENABLE_COLL_FT_RET) {
-        if (status == MPI_STATUS_IGNORE) status = &mystatus;
+    if (status == MPI_STATUS_IGNORE) status = &mystatus;
+    if (MPIR_CVAR_ENABLE_COLL_FT_RET)
         if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
-    }
 
     mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag,
                            comm_ptr, context_id, &recv_req_ptr);
@@ -536,10 +535,9 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
     MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
                          "**countneg", "**countneg %d", count);
 
-    if (MPIR_CVAR_ENABLE_COLL_FT_RET) {
-        if (status == MPI_STATUS_IGNORE) status = &mystatus;
+    if (status == MPI_STATUS_IGNORE) status = &mystatus;
+    if (MPIR_CVAR_ENABLE_COLL_FT_RET)
         if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
-    }
 
     MPID_Comm_get_ptr(comm, comm_ptr);
     context_id_offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ?

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

Summary of changes:
 src/mpi/coll/helper_fns.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository