[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-184-ge99e882
Service Account
noreply at mpich.org
Wed Nov 12 14:42:05 CST 2014
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 e99e8822e8adc0caa63e2fbb55d977dc3d7972b2 (commit)
via af8b2d04b0e7e96413b55341a3b39465efd83bb1 (commit)
via a91f178a7e7a1092a404208c10cc463c64ea3a34 (commit)
via 96deece29001bc8e7044b1f0b012ef5db02fbdcc (commit)
via 47f62b0c690cef80398b74b8c86ff6bc14d141e2 (commit)
via 3850e6bf639fbd67a121fe7446c5615739799bd9 (commit)
via 46f59276bcfce78af04215bfa8cf544d0cef079f (commit)
from 316ac29bcb48562f7308f886bd4eaa8f6e4bcbb7 (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/e99e8822e8adc0caa63e2fbb55d977dc3d7972b2
commit e99e8822e8adc0caa63e2fbb55d977dc3d7972b2
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date: Mon Nov 10 22:48:04 2014 -0600
Enable all ft tests
Fixes #1945
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist
index a122445..604211a 100644
--- a/test/mpi/ft/testlist
+++ b/test/mpi/ft/testlist
@@ -3,9 +3,9 @@ abort 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10
sendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors
isendalive 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false
multi_isendalive 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false
-senddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
+senddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
recvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
-isenddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
+isenddead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
irecvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
barrier 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
gather 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
@@ -14,5 +14,5 @@ bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=Te
scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
anysource 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
revoke_nofail 2 env=MPIR_CVAR_ENABLE_FT=1 strict=false timeLimit=10
-shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
-agree 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
+shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
+agree 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
http://git.mpich.org/mpich.git/commitdiff/af8b2d04b0e7e96413b55341a3b39465efd83bb1
commit af8b2d04b0e7e96413b55341a3b39465efd83bb1
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date: Mon Nov 10 22:43:27 2014 -0600
Adds checking VC state in MPID_Recv
Similar to d086ac27, check the state of a VC to see if it is valid
before creating a group, request or communicator in MPID_Recv.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c
index 40781c8..874f019 100644
--- a/src/mpid/ch3/src/mpid_recv.c
+++ b/src/mpid/ch3/src/mpid_recv.c
@@ -75,6 +75,7 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
if (MPIDI_Request_get_sync_send_flag(rreq))
{
MPIDI_Comm_get_vc_set_active(comm, rreq->dev.match.parts.rank, &vc);
+ MPIU_ERR_CHKANDJUMP1(vc->state == MPIDI_VC_STATE_MORIBUND, mpi_errno, MPIX_ERR_PROC_FAILED, "**comm_fail", "**comm_fail %d", rreq->dev.match.parts.rank);
mpi_errno = MPIDI_CH3_EagerSyncAck( vc, rreq );
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
}
@@ -126,6 +127,7 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_RNDV_MSG)
{
MPIDI_Comm_get_vc_set_active(comm, rreq->dev.match.parts.rank, &vc);
+ MPIU_ERR_CHKANDJUMP1(vc->state == MPIDI_VC_STATE_MORIBUND, mpi_errno, MPIX_ERR_PROC_FAILED, "**comm_fail", "**comm_fail %d", rreq->dev.match.parts.rank);
mpi_errno = vc->rndvRecv_fn( vc, rreq );
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN)
http://git.mpich.org/mpich.git/commitdiff/a91f178a7e7a1092a404208c10cc463c64ea3a34
commit a91f178a7e7a1092a404208c10cc463c64ea3a34
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date: Mon Nov 10 16:50:38 2014 -0600
Adds checking VC state in MPID_Send
MPID_Send should first check the state of a VC to see if it is valid
before creating a group, request or communicator.
In the case of fault tolerance, if VC has already been revoked or marked
as terminated (e.g., in test/mpi/ft/senddead). The send operation
evolved should exit without creating any memory objects of request,
group or communicator.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c
index 52dad34..bb9338d 100644
--- a/src/mpid/ch3/src/mpid_send.c
+++ b/src/mpid/ch3/src/mpid_send.c
@@ -72,6 +72,7 @@ int MPID_Send(const void * buf, int count, MPI_Datatype datatype, int rank,
}
MPIDI_Comm_get_vc_set_active(comm, rank, &vc);
+ MPIU_ERR_CHKANDJUMP1(vc->state == MPIDI_VC_STATE_MORIBUND, mpi_errno, MPIX_ERR_PROC_FAILED, "**comm_fail", "**comm_fail %d", rank);
#ifdef ENABLE_COMM_OVERRIDES
if (vc->comm_ops && vc->comm_ops->send)
http://git.mpich.org/mpich.git/commitdiff/96deece29001bc8e7044b1f0b012ef5db02fbdcc
commit 96deece29001bc8e7044b1f0b012ef5db02fbdcc
Author: Wesley Bland <wbland at anl.gov>
Date: Mon Nov 10 22:09:00 2014 -0600
Mark collective FT tests as passing
The collective FT tests now pass with debug output turned off.
See #1945
Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>
diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist
index 503dfaf..a122445 100644
--- a/test/mpi/ft/testlist
+++ b/test/mpi/ft/testlist
@@ -10,8 +10,8 @@ irecvdead 2 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTes
barrier 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
gather 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
reduce 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
-bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
-scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
+bcast 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
+scatter 4 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
anysource 3 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10
revoke_nofail 2 env=MPIR_CVAR_ENABLE_FT=1 strict=false timeLimit=10
shrink 8 env=MPIR_CVAR_ENABLE_FT=1 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945
http://git.mpich.org/mpich.git/commitdiff/47f62b0c690cef80398b74b8c86ff6bc14d141e2
commit 47f62b0c690cef80398b74b8c86ff6bc14d141e2
Author: Wesley Bland <wbland at anl.gov>
Date: Mon Nov 10 14:07:59 2014 -0600
Correctly handle errflag in MPI collectives
The MPI collectives get and set the errflag used by the collective
helper functions (MPIC_*). The possible values of the errflag changed,
so the collective functions need to appropriately set this value using
either MPIR_ERR_NONE (MPI_SUCCESS), MPIR_ERR_PROC_FAILED
(MPIX_ERR_PROC_FAILED), or MPIR_ERR_OTHER (MPI_ERR_OTHER).
This should allow collectives to correctly report process failures when
they occur now, fixing the FT tests that use collectives (see #1945).
Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>
diff --git a/maint/extracterrmsgs b/maint/extracterrmsgs
index 1735459..5fe997e 100755
--- a/maint/extracterrmsgs
+++ b/maint/extracterrmsgs
@@ -728,7 +728,9 @@ sub ProcessFile
!($args[$errClassLoc] =~ /^MPI_T_ERR_/) &&
!($args[$errClassLoc] =~ /^MPIDU_SOCK_ERR_/) &&
!($args[$errClassLoc] =~ /^MPIX_ERR_/) &&
- !($args[$errClassLoc] =~ /^errclass/) ) {
+ !($args[$errClassLoc] =~ /^errclass/) &&
+ !($args[$errClassLoc] =~ /^\*\(errflag_\)/) &&
+ !($args[$errClassLoc] =~ /^\*errflag/)) {
$bad_syntax_in_file{$filename} = 1;
print STDERR "Invalid argument $args[$errClassLoc] for the MPI Error class in $routineName in $filename\n";
next;
diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c
index e9900a0..7d6799e 100644
--- a/src/mpi/coll/allgather.c
+++ b/src/mpi/coll/allgather.c
@@ -212,8 +212,8 @@ int MPIR_Allgather_intra (
MPIR_ALLGATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -277,8 +277,8 @@ int MPIR_Allgather_intra (
sent now. */
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -296,8 +296,8 @@ int MPIR_Allgather_intra (
no. of processes whose data we don't have */
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -380,8 +380,8 @@ int MPIR_Allgather_intra (
MPIR_ALLGATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -435,8 +435,8 @@ int MPIR_Allgather_intra (
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* last_recv_cnt was set in the previous
@@ -457,8 +457,8 @@ int MPIR_Allgather_intra (
no. of processes whose data we don't have */
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -532,8 +532,8 @@ int MPIR_Allgather_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
curr_cnt *= 2;
@@ -555,8 +555,8 @@ int MPIR_Allgather_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -617,8 +617,8 @@ int MPIR_Allgather_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
j = jnext;
@@ -632,8 +632,8 @@ int MPIR_Allgather_intra (
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
@@ -702,8 +702,8 @@ int MPIR_Allgather_inter (
sendtype, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -718,8 +718,8 @@ int MPIR_Allgather_inter (
sendtype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -731,8 +731,8 @@ int MPIR_Allgather_inter (
recvtype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -745,8 +745,8 @@ int MPIR_Allgather_inter (
recvtype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -758,8 +758,8 @@ int MPIR_Allgather_inter (
sendtype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -769,8 +769,8 @@ int MPIR_Allgather_inter (
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c
index 2af46b0..8064713 100644
--- a/src/mpi/coll/allgatherv.c
+++ b/src/mpi/coll/allgatherv.c
@@ -217,8 +217,8 @@ int MPIR_Allgatherv_intra (
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -285,8 +285,8 @@ int MPIR_Allgatherv_intra (
MPIR_ALLGATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* last_recv_cnt was set in the previous
@@ -309,8 +309,8 @@ int MPIR_Allgatherv_intra (
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -418,8 +418,8 @@ int MPIR_Allgatherv_intra (
MPIR_ALLGATHERV_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -478,8 +478,8 @@ int MPIR_Allgatherv_intra (
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* last_recv_cnt was set in the previous
@@ -498,8 +498,8 @@ int MPIR_Allgatherv_intra (
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -580,8 +580,8 @@ int MPIR_Allgatherv_intra (
src, MPIR_ALLGATHERV_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_cnt = 0;
} else
@@ -610,8 +610,8 @@ int MPIR_Allgatherv_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -698,8 +698,8 @@ int MPIR_Allgatherv_intra (
mpi_errno = MPIC_Recv(rbuf, recvnow, recvtype, left, MPIR_ALLGATHERV_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
torecv -= recvnow;
@@ -708,8 +708,8 @@ int MPIR_Allgatherv_intra (
mpi_errno = MPIC_Send(sbuf, sendnow, recvtype, right, MPIR_ALLGATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
tosend -= sendnow;
@@ -720,8 +720,8 @@ int MPIR_Allgatherv_intra (
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
tosend -= sendnow;
@@ -747,8 +747,8 @@ int MPIR_Allgatherv_intra (
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
@@ -799,8 +799,8 @@ int MPIR_Allgatherv_inter (
comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* gatherv to right group */
@@ -810,8 +810,8 @@ int MPIR_Allgatherv_inter (
comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -823,8 +823,8 @@ int MPIR_Allgatherv_inter (
comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* gatherv from left group */
@@ -834,8 +834,8 @@ int MPIR_Allgatherv_inter (
comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -860,8 +860,8 @@ int MPIR_Allgatherv_inter (
mpi_errno = MPIR_Bcast_intra(recvbuf, 1, newtype, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -870,7 +870,7 @@ int MPIR_Allgatherv_inter (
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
+ else if (*errflag != MPIR_ERR_NONE)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c
index 9f50e2e..6c66347 100644
--- a/src/mpi/coll/allred_group.c
+++ b/src/mpi/coll/allred_group.c
@@ -95,8 +95,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
tag, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -113,8 +113,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -162,8 +162,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
} else {
@@ -246,8 +246,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -312,8 +312,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -343,8 +343,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
}
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -353,8 +353,8 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return (mpi_errno);
fn_fail:
diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c
index cfcc99d..c7dc13f 100644
--- a/src/mpi/coll/allreduce.c
+++ b/src/mpi/coll/allreduce.c
@@ -228,16 +228,16 @@ int MPIR_Allreduce_intra (
mpi_errno = MPIR_Reduce_impl(recvbuf, NULL, count, datatype, op, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
} else {
mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, op, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -255,8 +255,8 @@ int MPIR_Allreduce_intra (
errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -266,8 +266,8 @@ int MPIR_Allreduce_intra (
mpi_errno = MPIR_Bcast_impl(recvbuf, count, datatype, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -290,16 +290,16 @@ int MPIR_Allreduce_intra (
op, 0, comm_ptr, errflag );
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
mpi_errno = MPIR_Bcast_impl( recvbuf, count, datatype, 0, comm_ptr, errflag );
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -352,8 +352,8 @@ int MPIR_Allreduce_intra (
MPIR_ALLREDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -369,8 +369,8 @@ int MPIR_Allreduce_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -415,8 +415,8 @@ int MPIR_Allreduce_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -500,8 +500,8 @@ int MPIR_Allreduce_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -565,8 +565,8 @@ int MPIR_Allreduce_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -592,8 +592,8 @@ int MPIR_Allreduce_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -668,8 +668,8 @@ int MPIR_Allreduce_inter (
op, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -680,8 +680,8 @@ int MPIR_Allreduce_inter (
comm, MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -691,8 +691,8 @@ int MPIR_Allreduce_inter (
0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -701,8 +701,8 @@ int MPIR_Allreduce_inter (
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c
index 1ca98c6..576931d 100644
--- a/src/mpi/coll/alltoall.c
+++ b/src/mpi/coll/alltoall.c
@@ -195,8 +195,8 @@ int MPIR_Alltoall_intra(
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -209,8 +209,8 @@ int MPIR_Alltoall_intra(
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -283,8 +283,8 @@ int MPIR_Alltoall_intra(
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -374,8 +374,8 @@ int MPIR_Alltoall_intra(
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -428,8 +428,8 @@ int MPIR_Alltoall_intra(
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -446,8 +446,8 @@ int MPIR_Alltoall_intra(
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
last_recv_cnt = 0;
} else
@@ -536,8 +536,8 @@ int MPIR_Alltoall_intra(
mpi_errno = starray[j].MPI_ERROR;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -591,8 +591,8 @@ int MPIR_Alltoall_intra(
MPIR_ALLTOALL_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -604,8 +604,8 @@ int MPIR_Alltoall_intra(
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
@@ -691,8 +691,8 @@ int MPIR_Alltoall_inter(
MPIR_ALLTOALL_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -702,8 +702,8 @@ int MPIR_Alltoall_inter(
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c
index 607cb3a..7db2166 100644
--- a/src/mpi/coll/alltoallv.c
+++ b/src/mpi/coll/alltoallv.c
@@ -111,8 +111,8 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -126,8 +126,8 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -162,8 +162,8 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *
&reqarray[req_cnt]);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
req_cnt++;
@@ -184,8 +184,8 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *
&reqarray[req_cnt], errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
req_cnt++;
@@ -203,8 +203,8 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *
mpi_errno = starray[i].MPI_ERROR;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -221,8 +221,8 @@ fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
@@ -309,8 +309,8 @@ int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -320,8 +320,8 @@ int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c
index fa99a58..ecd8852 100644
--- a/src/mpi/coll/alltoallw.c
+++ b/src/mpi/coll/alltoallw.c
@@ -101,8 +101,8 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -115,8 +115,8 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -178,8 +178,8 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
mpi_errno = starray[i].MPI_ERROR;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -209,8 +209,8 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
MPIR_ALLTOALLW_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -223,8 +223,8 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
@@ -304,8 +304,8 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int
MPIR_ALLTOALLW_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -315,8 +315,8 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c
index 8d4957a..38a311f 100644
--- a/src/mpi/coll/barrier.c
+++ b/src/mpi/coll/barrier.c
@@ -81,8 +81,8 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
mpi_errno = MPIR_Barrier_impl(comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -92,8 +92,8 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
mpi_errno = MPIR_Barrier_impl(comm_ptr->node_roots_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -107,8 +107,8 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
mpi_errno = MPIR_Bcast_impl(&i, 1, MPI_BYTE, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -116,8 +116,8 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -147,8 +147,8 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = barrier_smp_intra(comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
goto fn_exit;
@@ -167,8 +167,8 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
mask <<= 1;
@@ -178,8 +178,8 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -212,8 +212,8 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = MPIR_Barrier_intra(newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -230,8 +230,8 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = MPIR_Bcast_inter(&i, 1, MPI_BYTE, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -240,8 +240,8 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = MPIR_Bcast_inter(&i, 1, MPI_BYTE, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -251,8 +251,8 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = MPIR_Bcast_inter(&i, 1, MPI_BYTE, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -261,16 +261,16 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
mpi_errno = MPIR_Bcast_inter(&i, 1, MPI_BYTE, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -316,7 +316,6 @@ int MPIR_Barrier(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
int MPIR_Barrier_impl(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
- int mpi_errno_ret = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Barrier != NULL)
{
/* --BEGIN USEREXTENSION-- */
@@ -331,10 +330,8 @@ int MPIR_Barrier_impl(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
}
fn_exit:
- if (mpi_errno_ret)
- mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/barrier_group.c b/src/mpi/coll/barrier_group.c
index f110328..d55f097 100644
--- a/src/mpi/coll/barrier_group.c
+++ b/src/mpi/coll/barrier_group.c
@@ -24,8 +24,8 @@ int MPIR_Barrier_group( MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, mpi
mpi_errno = MPIR_Allreduce_group(&src, &dst, 1, MPI_INT, MPI_BAND,
comm_ptr, group_ptr, tag, errflag);
- if (mpi_errno != MPI_SUCCESS)
- *errflag = TRUE;
+ if (mpi_errno != MPI_SUCCESS || *errflag != MPIR_ERR_NONE)
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
fn_exit:
return mpi_errno;
diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c
index bbf6acc..e1abbda 100644
--- a/src/mpi/coll/bcast.c
+++ b/src/mpi/coll/bcast.c
@@ -237,8 +237,8 @@ static int MPIR_Bcast_binomial(
MPIR_BCAST_TAG,comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -246,8 +246,8 @@ static int MPIR_Bcast_binomial(
MPIR_Get_count_impl(&status, MPI_BYTE, &recvd_size);
/* recvd_size may not be accurate for packed heterogeneous data */
if (is_homogeneous && recvd_size != nbytes) {
- *errflag = TRUE;
- MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
+ if (*errflag == MPIR_ERR_NONE) *errflag = MPIR_ERR_OTHER;
+ MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
"**collective_size_mismatch",
"**collective_size_mismatch %d %d", recvd_size, nbytes );
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
@@ -283,8 +283,8 @@ static int MPIR_Bcast_binomial(
MPIR_BCAST_TAG,comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -308,8 +308,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -395,8 +395,8 @@ static int scatter_for_bcast(
MPIR_BCAST_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
curr_size = 0;
} else
@@ -431,8 +431,8 @@ static int scatter_for_bcast(
MPIR_BCAST_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -446,8 +446,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -569,8 +569,8 @@ static int MPIR_Bcast_scatter_doubling_allgather(
nbytes, tmp_buf, is_contig, is_homogeneous, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -615,8 +615,8 @@ static int MPIR_Bcast_scatter_doubling_allgather(
if (mpi_errno) {
/* --BEGIN ERROR HANDLING-- */
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_size = 0;
/* --END ERROR HANDLING-- */
@@ -691,8 +691,8 @@ static int MPIR_Bcast_scatter_doubling_allgather(
sent now. */
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -713,8 +713,8 @@ static int MPIR_Bcast_scatter_doubling_allgather(
if (mpi_errno) {
/* --BEGIN ERROR HANDLING-- */
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_size = 0;
/* --END ERROR HANDLING-- */
@@ -737,8 +737,8 @@ static int MPIR_Bcast_scatter_doubling_allgather(
/* check that we received as much as we expected */
/* recvd_size may not be accurate for packed heterogeneous data */
if (is_homogeneous && curr_size != nbytes) {
- *errflag = TRUE;
- MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
+ if (*errflag == MPIR_ERR_NONE) *errflag = MPIR_ERR_OTHER;
+ MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
"**collective_size_mismatch",
"**collective_size_mismatch %d %d", curr_size, nbytes );
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
@@ -760,8 +760,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -876,8 +876,8 @@ static int MPIR_Bcast_scatter_ring_allgather(
nbytes, tmp_buf, is_contig, is_homogeneous, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -915,8 +915,8 @@ static int MPIR_Bcast_scatter_ring_allgather(
comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
MPIR_Get_count_impl(&status, MPI_BYTE, &recvd_size);
@@ -928,8 +928,8 @@ static int MPIR_Bcast_scatter_ring_allgather(
/* check that we received as much as we expected */
/* recvd_size may not be accurate for packed heterogeneous data */
if (is_homogeneous && curr_size != nbytes) {
- *errflag = TRUE;
- MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
+ if (*errflag == MPIR_ERR_NONE) *errflag = MPIR_ERR_OTHER;
+ MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
"**collective_size_mismatch",
"**collective_size_mismatch %d %d", curr_size, nbytes );
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
@@ -951,8 +951,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -980,8 +980,8 @@ fn_fail:
} \
if (mpi_errno_) { \
/* for communication errors, just record the error but continue */ \
- *(errflag_) = TRUE; \
- MPIU_ERR_SET(mpi_errno_, MPI_ERR_OTHER, "**fail"); \
+ *(errflag_) = MPIR_ERR_GET_CLASS(mpi_errno_); \
+ MPIU_ERR_SET(mpi_errno_, *(errflag_), "**fail"); \
MPIU_ERR_ADD(mpi_errno_ret_, mpi_errno_); \
} \
} while (0)
@@ -1051,8 +1051,8 @@ static int MPIR_SMP_Bcast(
MPIR_BCAST_TAG,comm_ptr->node_comm->handle, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1061,16 +1061,16 @@ static int MPIR_SMP_Bcast(
MPIR_BCAST_TAG,comm_ptr->node_comm->handle, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* check that we received as much as we expected */
MPIR_Get_count_impl(&status, MPI_BYTE, &recvd_size);
/* recvd_size may not be accurate for packed heterogeneous data */
if (is_homogeneous && recvd_size != nbytes) {
- *errflag = TRUE;
- MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
+ if (*errflag == MPIR_ERR_NONE) *errflag = MPIR_ERR_OTHER;
+ MPIU_ERR_SET2(mpi_errno, MPI_ERR_OTHER,
"**collective_size_mismatch",
"**collective_size_mismatch %d %d",
recvd_size, nbytes );
@@ -1156,8 +1156,8 @@ static int MPIR_SMP_Bcast(
mpi_errno = MPIR_Bcast_scatter_ring_allgather(buffer, count, datatype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1167,8 +1167,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -1253,8 +1253,8 @@ int MPIR_Bcast_intra (
mpi_errno = MPIR_SMP_Bcast(buffer, count, datatype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
goto fn_exit;
@@ -1291,8 +1291,8 @@ int MPIR_Bcast_intra (
mpi_errno = MPIR_Bcast_binomial(buffer, count, datatype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1303,8 +1303,8 @@ int MPIR_Bcast_intra (
mpi_errno = MPIR_Bcast_scatter_doubling_allgather(buffer, count, datatype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1316,8 +1316,8 @@ int MPIR_Bcast_intra (
mpi_errno = MPIR_Bcast_scatter_ring_allgather(buffer, count, datatype, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1332,8 +1332,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -1383,8 +1383,8 @@ int MPIR_Bcast_inter (
MPIR_BCAST_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
@@ -1401,8 +1401,8 @@ int MPIR_Bcast_inter (
MPIR_BCAST_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1418,8 +1418,8 @@ int MPIR_Bcast_inter (
mpi_errno = MPIR_Bcast_intra(buffer, count, datatype, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1429,7 +1429,7 @@ fn_fail:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
+ else if (*errflag != MPIR_ERR_NONE)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c
index 86b8f14..f14444a 100644
--- a/src/mpi/coll/exscan.c
+++ b/src/mpi/coll/exscan.c
@@ -161,8 +161,8 @@ int MPIR_Exscan (
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -224,7 +224,7 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
+ else if (*errflag != MPIR_ERR_NONE)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c
index 81bb78f..fa8a983 100644
--- a/src/mpi/coll/gather.c
+++ b/src/mpi/coll/gather.c
@@ -226,8 +226,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -236,8 +236,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
src, MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
copy_offset = rank + mask;
@@ -259,8 +259,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -287,8 +287,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
curr_cnt += (recvblks * nbytes);
@@ -307,8 +307,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -317,8 +317,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -340,8 +340,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
MPIR_Type_free_impl(&tmp_type);
@@ -413,8 +413,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_size = 0;
} else
@@ -432,8 +432,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
break;
@@ -476,8 +476,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -549,8 +549,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -588,8 +588,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -600,8 +600,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -623,8 +623,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -635,8 +635,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_GATHER_TAG,comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -647,8 +647,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c
index cc7a54a..d1b6f94 100644
--- a/src/mpi/coll/gatherv.c
+++ b/src/mpi/coll/gatherv.c
@@ -149,8 +149,8 @@ int MPIR_Gatherv (
mpi_errno = starray[i].MPI_ERROR;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -177,8 +177,8 @@ int MPIR_Gatherv (
MPIR_GATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -187,8 +187,8 @@ int MPIR_Gatherv (
MPIR_GATHERV_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -202,8 +202,8 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c
index 243d2a0..588092f 100644
--- a/src/mpi/coll/helper_fns.c
+++ b/src/mpi/coll/helper_fns.c
@@ -272,7 +272,7 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t
break;
case MPIR_ERR_PROC_FAILED:
MPIR_TAG_SET_PROC_FAILURE_BIT(tag);
- case MPIR_ERR_OTHER:
+ default:
MPIR_TAG_SET_ERROR_BIT(tag);
}
@@ -391,8 +391,14 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int
context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
- if (*errflag)
- MPIR_TAG_SET_ERROR_BIT(tag);
+ switch(*errflag) {
+ case MPIR_ERR_NONE:
+ break;
+ case MPIR_ERR_PROC_FAILED:
+ MPIR_TAG_SET_PROC_FAILURE_BIT(tag);
+ default:
+ MPIR_TAG_SET_ERROR_BIT(tag);
+ }
mpi_errno = MPID_Ssend(buf, count, datatype, dest, tag, comm_ptr,
context_id, &request_ptr);
@@ -448,7 +454,7 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
break;
case MPIR_ERR_PROC_FAILED:
MPIR_TAG_SET_PROC_FAILURE_BIT(sendtag);
- case MPIR_ERR_OTHER:
+ default:
MPIR_TAG_SET_ERROR_BIT(sendtag);
}
@@ -537,7 +543,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
break;
case MPIR_ERR_PROC_FAILED:
MPIR_TAG_SET_PROC_FAILURE_BIT(sendtag);
- case MPIR_ERR_OTHER:
+ default:
MPIR_TAG_SET_ERROR_BIT(sendtag);
}
@@ -650,7 +656,7 @@ int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int
break;
case MPIR_ERR_PROC_FAILED:
MPIR_TAG_SET_PROC_FAILURE_BIT(tag);
- case MPIR_ERR_OTHER:
+ default:
MPIR_TAG_SET_ERROR_BIT(tag);
}
diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c
index 0f7beed..3d842bc 100644
--- a/src/mpi/coll/iscatter.c
+++ b/src/mpi/coll/iscatter.c
@@ -367,8 +367,8 @@ int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtyp
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
curr_cnt = 0;
} else
@@ -398,8 +398,8 @@ int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtyp
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
curr_cnt -= send_subtree_cnt;
diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c
index afc3255..fa7105b 100644
--- a/src/mpi/coll/red_scat.c
+++ b/src/mpi/coll/red_scat.c
@@ -139,8 +139,8 @@ static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const
comm, MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* always perform the reduction at recv_offset, the data at send_offset
@@ -180,8 +180,8 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -348,8 +348,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
MPIR_REDUCE_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -365,8 +365,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -461,8 +461,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -505,8 +505,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
MPIR_REDUCE_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -519,8 +519,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -569,8 +569,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -646,8 +646,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
mpi_errno = MPIR_Reduce_scatter_noncomm(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -745,8 +745,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
received = 1;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -792,8 +792,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -808,8 +808,8 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv
received = 1;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -881,8 +881,8 @@ fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -949,8 +949,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -960,8 +960,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -972,8 +972,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -983,8 +983,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1001,8 +1001,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
recvcounts[rank], datatype, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -1010,8 +1010,8 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c
index a19709f..fdab92e 100644
--- a/src/mpi/coll/red_scat_block.c
+++ b/src/mpi/coll/red_scat_block.c
@@ -131,8 +131,8 @@ static int MPIR_Reduce_scatter_block_noncomm (
comm, MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
/* always perform the reduction at recv_offset, the data at send_offset
@@ -173,8 +173,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -347,8 +347,8 @@ int MPIR_Reduce_scatter_block_intra (
MPIR_REDUCE_SCATTER_BLOCK_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -364,8 +364,8 @@ int MPIR_Reduce_scatter_block_intra (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -460,8 +460,8 @@ int MPIR_Reduce_scatter_block_intra (
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -507,8 +507,8 @@ int MPIR_Reduce_scatter_block_intra (
}
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -555,8 +555,8 @@ int MPIR_Reduce_scatter_block_intra (
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -621,8 +621,8 @@ int MPIR_Reduce_scatter_block_intra (
mpi_errno = MPIR_Reduce_scatter_block_noncomm(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -720,8 +720,8 @@ int MPIR_Reduce_scatter_block_intra (
received = 1;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -767,8 +767,8 @@ int MPIR_Reduce_scatter_block_intra (
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -783,8 +783,8 @@ int MPIR_Reduce_scatter_block_intra (
received = 1;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -853,8 +853,8 @@ fn_exit:
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
@@ -916,8 +916,8 @@ int MPIR_Reduce_scatter_block_inter (
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -927,8 +927,8 @@ int MPIR_Reduce_scatter_block_inter (
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -939,8 +939,8 @@ int MPIR_Reduce_scatter_block_inter (
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -950,8 +950,8 @@ int MPIR_Reduce_scatter_block_inter (
root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -966,8 +966,8 @@ int MPIR_Reduce_scatter_block_inter (
recvcount, datatype, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -976,8 +976,8 @@ int MPIR_Reduce_scatter_block_inter (
/* --BEGIN ERROR HANDLING-- */
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c
index 2e56814..b5cdaa9 100644
--- a/src/mpi/coll/reduce.c
+++ b/src/mpi/coll/reduce.c
@@ -184,8 +184,8 @@ static int MPIR_Reduce_binomial (
MPIR_REDUCE_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -213,8 +213,8 @@ static int MPIR_Reduce_binomial (
source, MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
break;
@@ -236,8 +236,8 @@ static int MPIR_Reduce_binomial (
}
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -246,8 +246,8 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -376,8 +376,8 @@ static int MPIR_Reduce_redscat_gather (
MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -393,8 +393,8 @@ static int MPIR_Reduce_redscat_gather (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -468,8 +468,8 @@ static int MPIR_Reduce_redscat_gather (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -517,8 +517,8 @@ static int MPIR_Reduce_redscat_gather (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
newrank = 0;
@@ -530,8 +530,8 @@ static int MPIR_Reduce_redscat_gather (
root, MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
newrank = -1;
@@ -604,8 +604,8 @@ static int MPIR_Reduce_redscat_gather (
comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
break;
@@ -621,8 +621,8 @@ static int MPIR_Reduce_redscat_gather (
MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -647,8 +647,8 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -774,8 +774,8 @@ int MPIR_Reduce_intra (
op, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -791,8 +791,8 @@ int MPIR_Reduce_intra (
comm_ptr->node_roots_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -806,8 +806,8 @@ int MPIR_Reduce_intra (
comm_ptr->node_roots_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -822,8 +822,8 @@ int MPIR_Reduce_intra (
comm_ptr->node_roots_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -842,8 +842,8 @@ int MPIR_Reduce_intra (
comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -867,8 +867,8 @@ int MPIR_Reduce_intra (
mpi_errno = MPIR_Reduce_redscat_gather(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -877,8 +877,8 @@ int MPIR_Reduce_intra (
mpi_errno = MPIR_Reduce_binomial(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -892,8 +892,8 @@ int MPIR_Reduce_intra (
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -947,8 +947,8 @@ int MPIR_Reduce_inter (
MPIR_REDUCE_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -985,8 +985,8 @@ int MPIR_Reduce_inter (
op, 0, newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -996,8 +996,8 @@ int MPIR_Reduce_inter (
MPIR_REDUCE_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -1008,8 +1008,8 @@ int MPIR_Reduce_inter (
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c
index 6aa9372..05df09b 100644
--- a/src/mpi/coll/scan.c
+++ b/src/mpi/coll/scan.c
@@ -161,8 +161,8 @@ static int MPIR_Scan_generic (
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -206,8 +206,8 @@ static int MPIR_Scan_generic (
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -285,8 +285,8 @@ int MPIR_Scan(
op, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -308,8 +308,8 @@ int MPIR_Scan(
comm_ptr->node_comm->handle, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -321,8 +321,8 @@ int MPIR_Scan(
0, MPIR_SCAN_TAG, comm_ptr->node_comm->handle, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -341,8 +341,8 @@ int MPIR_Scan(
op, comm_ptr->node_roots_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
@@ -354,8 +354,8 @@ int MPIR_Scan(
MPIR_SCAN_TAG, comm_ptr->node_roots_comm->handle, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -368,8 +368,8 @@ int MPIR_Scan(
noneed = 0;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -385,8 +385,8 @@ int MPIR_Scan(
mpi_errno = MPIR_Bcast_impl(&noneed, 1, MPI_INT, 0, comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -397,8 +397,8 @@ int MPIR_Scan(
comm_ptr->node_comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -412,8 +412,8 @@ int MPIR_Scan(
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c
index 65edd74..94d9587 100644
--- a/src/mpi/coll/scatter.c
+++ b/src/mpi/coll/scatter.c
@@ -188,8 +188,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -198,8 +198,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
curr_cnt = 0;
} else
@@ -245,8 +245,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
}
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
curr_cnt -= send_subtree_cnt;
@@ -352,8 +352,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
curr_cnt = 0;
} else
@@ -383,8 +383,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
curr_cnt -= send_subtree_cnt;
@@ -408,8 +408,8 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
@@ -472,8 +472,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
sendtype, 0, MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
goto fn_exit;
@@ -502,8 +502,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG, comm, &status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -520,8 +520,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
newcomm_ptr, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -536,8 +536,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG, comm, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -547,8 +547,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIR_SCATTER_TAG,comm,&status, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -560,8 +560,8 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c
index f283679..4aaacc3 100644
--- a/src/mpi/coll/scatterv.c
+++ b/src/mpi/coll/scatterv.c
@@ -121,8 +121,8 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
mpi_errno = starray[i].MPI_ERROR;
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -137,8 +137,8 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
MPIR_SCATTERV_TAG,comm,MPI_STATUS_IGNORE, errflag);
if (mpi_errno) {
/* for communication errors, just record the error but continue */
- *errflag = TRUE;
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail");
+ *errflag = MPIR_ERR_GET_CLASS(mpi_errno);
+ MPIU_ERR_SET(mpi_errno, *errflag, "**fail");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
}
@@ -151,8 +151,8 @@ fn_exit:
MPIU_CHKLMEM_FREEALL();
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
- else if (*errflag)
- MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
+ else if (*errflag != MPIR_ERR_NONE)
+ MPIU_ERR_SET(mpi_errno, *errflag, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
http://git.mpich.org/mpich.git/commitdiff/3850e6bf639fbd67a121fe7446c5615739799bd9
commit 3850e6bf639fbd67a121fe7446c5615739799bd9
Author: Wesley Bland <wbland at anl.gov>
Date: Mon Nov 10 12:39:06 2014 -0600
Change errflag to be an enum
The errflag value being used in the MPIC helper functions only
propagated whether or not an error occurred. It did not contain any
information about what kind of error occurred, which made returning the
correct error code after a process failure impossible.
This patch converts the binary value to an enum with three options:
MPIR_ERR_NONE
MPIR_ERR_PROC_FAILED
MPIR_ERR_OTHER
The original use of TRUE and false maps to MPIR_ERR_NONE and
MPIR_ERR_OTHER.
MPIR_ERR_PROC_FAILED indicates that the error occurred
because of a process failure. It uses the new bit set aside from the tag
space to track such information between processes.
This change required modifying lots of function signatures and type
declarations to use the new enum type, but these are actually not very
intrusive changes and shouldn't be a problem going forward.
Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 5dd363f..09f5b52 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -720,6 +720,14 @@ extern MPID_Errhandler MPID_Errhandler_direct[];
} while (0)
/* ------------------------------------------------------------------------- */
+/* Define a typedef for the errflag value used by many internal functions.
+ * If an error needs to be returned, these values can be used to signal such.
+ * More details can be found further down in the code with the bitmasking logic */
+typedef enum {MPIR_ERR_NONE = MPI_SUCCESS,
+ MPIR_ERR_PROC_FAILED = MPIX_ERR_PROC_FAILED,
+ MPIR_ERR_OTHER = MPI_ERR_OTHER}
+mpir_errflag_t;
+
/* ------------------------------------------------------------------------- */
/* Keyvals and attributes */
/*TKyOverview.tex
@@ -1967,37 +1975,37 @@ extern MPIU_Object_alloc_t MPID_Op_mem;
typedef struct MPID_Collops {
int ref_count; /* Supports lazy copies */
/* Contains pointers to the functions for the MPI collectives */
- int (*Barrier) (MPID_Comm *, int *);
- int (*Bcast) (void*, int, MPI_Datatype, int, MPID_Comm *, int *);
+ int (*Barrier) (MPID_Comm *, mpir_errflag_t *);
+ int (*Bcast) (void*, int, MPI_Datatype, int, MPID_Comm *, mpir_errflag_t *);
int (*Gather) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype,
- int, MPID_Comm *, int *);
+ int, MPID_Comm *, mpir_errflag_t *);
int (*Gatherv) (const void*, int, MPI_Datatype, void*, const int *, const int *,
- MPI_Datatype, int, MPID_Comm *, int *);
+ MPI_Datatype, int, MPID_Comm *, mpir_errflag_t *);
int (*Scatter) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype,
- int, MPID_Comm *, int *);
+ int, MPID_Comm *, mpir_errflag_t *);
int (*Scatterv) (const void*, const int *, const int *, MPI_Datatype,
- void*, int, MPI_Datatype, int, MPID_Comm *, int *);
+ void*, int, MPI_Datatype, int, MPID_Comm *, mpir_errflag_t *);
int (*Allgather) (const void*, int, MPI_Datatype, void*, int,
- MPI_Datatype, MPID_Comm *, int *);
+ MPI_Datatype, MPID_Comm *, mpir_errflag_t *);
int (*Allgatherv) (const void*, int, MPI_Datatype, void*, const int *,
- const int *, MPI_Datatype, MPID_Comm *, int *);
+ const int *, MPI_Datatype, MPID_Comm *, mpir_errflag_t *);
int (*Alltoall) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype,
- MPID_Comm *, int *);
+ MPID_Comm *, mpir_errflag_t *);
int (*Alltoallv) (const void*, const int *, const int *, MPI_Datatype,
void*, const int *, const int *, MPI_Datatype, MPID_Comm *,
- int *);
+ mpir_errflag_t *);
int (*Alltoallw) (const void*, const int *, const int *, const MPI_Datatype *, void*,
- const int *, const int *, const MPI_Datatype *, MPID_Comm *, int *);
+ const int *, const int *, const MPI_Datatype *, MPID_Comm *, mpir_errflag_t *);
int (*Reduce) (const void*, void*, int, MPI_Datatype, MPI_Op, int,
- MPID_Comm *, int *);
+ MPID_Comm *, mpir_errflag_t *);
int (*Allreduce) (const void*, void*, int, MPI_Datatype, MPI_Op,
- MPID_Comm *, int *);
+ MPID_Comm *, mpir_errflag_t *);
int (*Reduce_scatter) (const void*, void*, const int *, MPI_Datatype, MPI_Op,
- MPID_Comm *, int *);
- int (*Scan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, int * );
- int (*Exscan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, int * );
+ MPID_Comm *, mpir_errflag_t *);
+ int (*Scan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, mpir_errflag_t * );
+ int (*Exscan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, mpir_errflag_t * );
int (*Reduce_scatter_block) (const void*, void*, int, MPI_Datatype, MPI_Op,
- MPID_Comm *, int *);
+ MPID_Comm *, mpir_errflag_t *);
/* MPI-3 nonblocking collectives */
int (*Ibarrier_sched)(MPID_Comm *comm_ptr, MPID_Sched_t s);
@@ -2856,7 +2864,7 @@ int MPID_Comm_revoke(MPID_Comm *comm, int is_remote);
Return Value:
'MPI_SUCCESS' or a valid MPI error code.
@*/
-int MPID_Comm_agree(MPID_Comm *comm, uint32_t *bitarray, int *flag, int new_fail);
+int MPID_Comm_agree(MPID_Comm *comm, uint32_t *bitarray, int *flag, mpir_errflag_t new_fail);
/*@
MPID_Send - MPID entry point for MPI_Send
@@ -3933,24 +3941,24 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status);
/* FT versions of te MPIC_ functions */
int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, int *errflag);
+ MPI_Comm comm, mpir_errflag_t *errflag);
int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
- MPI_Comm comm, MPI_Status *status, int *errflag);
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag);
int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, int *errflag);
+ MPI_Comm comm, mpir_errflag_t *errflag);
int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dest, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int source, int recvtag,
- MPI_Comm comm, MPI_Status *status, int *errflag);
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag);
int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
int dest, int sendtag,
int source, int recvtag,
- MPI_Comm comm, MPI_Status *status, int *errflag);
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag);
int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, MPI_Request *request, int *errflag);
+ MPI_Comm comm, MPI_Request *request, mpir_errflag_t *errflag);
int MPIC_Irecv(void *buf, int count, MPI_Datatype datatype, int source,
int tag, MPI_Comm comm, MPI_Request *request);
-int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int *errflag);
+int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], mpir_errflag_t *errflag);
void MPIR_MAXF ( void *, void *, int *, MPI_Datatype * ) ;
@@ -4005,166 +4013,166 @@ int MPIR_Compare_equal(const void *a, const void *b, MPI_Datatype type);
int MPIR_Allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag );
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag );
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag );
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag );
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs,
- MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs,
- MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allgatherv_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs,
- MPI_Datatype recvtype, MPID_Comm *comm_pt, int *errflag );
+ MPI_Datatype recvtype, MPID_Comm *comm_pt, mpir_errflag_t *errflag );
int MPIR_Allgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs,
- MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Allreduce_intra(const void *sendbuf, void *recvbuf, int count,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Allreduce_inter(const void *sendbuf, void *recvbuf, int count,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoallv_impl(const void *sendbuf, const int *sendcnts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcnts,
const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr,
- int *errflag);
+ mpir_errflag_t *errflag);
int MPIR_Alltoallv(const void *sendbuf, const int *sendcnts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcnts,
- const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag);
+ const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcnts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcnts,
const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr,
- int *errflag);
+ mpir_errflag_t *errflag);
int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcnts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcnts,
const int *rdispls, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Alltoallw_impl(const void *sendbuf, const int *sendcnts, const int *sdispls,
const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts,
const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr,
- int *errflag);
+ mpir_errflag_t *errflag);
int MPIR_Alltoallw(const void *sendbuf, const int *sendcnts, const int *sdispls,
const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts,
const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr,
- int *errflag);
+ mpir_errflag_t *errflag);
int MPIR_Alltoallw_intra(const void *sendbuf, const int *sendcnts, const int *sdispls,
const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts,
const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr,
- int *errflag);
+ mpir_errflag_t *errflag);
int MPIR_Alltoallw_inter(const void *sendbuf, const int *sendcnts, const int *sdispls,
const MPI_Datatype *sendtypes, void *recvbuf,
const int *recvcnts, const int *rdispls, const MPI_Datatype *recvtypes,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Bcast_inter(void *buffer, int count, MPI_Datatype datatype,
- int root, MPID_Comm *comm_ptr, int *errflag);
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Bcast_intra (void *buffer, int count, MPI_Datatype datatype, int
- root, MPID_Comm *comm_ptr, int *errflag);
+ root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Bcast (void *buffer, int count, MPI_Datatype datatype, int
- root, MPID_Comm *comm_ptr, int *errflag);
+ root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Bcast_impl (void *buffer, int count, MPI_Datatype datatype, int
- root, MPID_Comm *comm_ptr, int *errflag);
+ root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Gather_impl (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag);
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Gather (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag);
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Gather_intra (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag);
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Gather_inter (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag );
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Gatherv (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, const int *recvcnts, const int *displs,
- MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Gatherv_impl (const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, const int *recvcnts, const int *displs,
- MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_scatter_impl(const void *sendbuf, void *recvbuf, const int *recvcnts,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcnts,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int *recvcnts,
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int *recvcnts,
MPI_Datatype datatype, MPI_Op op,
- MPID_Comm *comm_ptr, int *errflag);
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount,
MPI_Datatype datatype, MPI_Op op, MPID_Comm
- *comm_ptr, int *errflag );
+ *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount,
MPI_Datatype datatype, MPI_Op op, MPID_Comm
- *comm_ptr, int *errflag );
+ *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount,
MPI_Datatype datatype, MPI_Op op, MPID_Comm
- *comm_ptr, int *errflag );
+ *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount,
MPI_Datatype datatype, MPI_Op op, MPID_Comm
- *comm_ptr, int *errflag);
+ *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag );
+ MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Reduce_inter (const void *sendbuf, void *recvbuf, int count, MPI_Datatype
- datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag);
+ datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Scan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag);
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Scatter_impl(const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag );
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Scatter(const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag );
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Scatter_intra(const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag );
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Scatter_inter(const void *sendbuf, int sendcnt, MPI_Datatype sendtype,
void *recvbuf, int recvcnt, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag );
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag );
int MPIR_Scatterv_impl (const void *sendbuf, const int *sendcnts, const int *displs,
MPI_Datatype sendtype, void *recvbuf, int recvcnt,
MPI_Datatype recvtype, int root, MPID_Comm
- *comm_ptr, int *errflag);
+ *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Scatterv (const void *sendbuf, const int *sendcnts, const int *displs,
MPI_Datatype sendtype, void *recvbuf, int recvcnt,
MPI_Datatype recvtype, int root, MPID_Comm
- *comm_ptr, int *errflag);
-int MPIR_Barrier_impl( MPID_Comm *comm_ptr, int *errflag);
-int MPIR_Barrier( MPID_Comm *comm_ptr, int *errflag);
-int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag);
-int MPIR_Barrier_inter( MPID_Comm *comm_ptr, int *errflag);
+ *comm_ptr, mpir_errflag_t *errflag);
+int MPIR_Barrier_impl( MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
+int MPIR_Barrier( MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
+int MPIR_Barrier_intra( MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
+int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op);
@@ -4205,13 +4213,13 @@ int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag);
int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- MPID_Group *group_ptr, int tag, int *errflag);
+ MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag);
int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- MPID_Group *group_ptr, int tag, int *errflag);
+ MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag);
-int MPIR_Barrier_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, int *errflag);
+int MPIR_Barrier_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag);
/* topology impl functions */
diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c
index 31df564..e9900a0 100644
--- a/src/mpi/coll/allgather.c
+++ b/src/mpi/coll/allgather.c
@@ -117,7 +117,7 @@ int MPIR_Allgather_intra (
int recvcount,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int comm_size, rank;
int mpi_errno = MPI_SUCCESS;
@@ -657,7 +657,7 @@ int MPIR_Allgather_inter (
int recvcount,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator Allgather.
Each group does a gather to local root with the local
@@ -789,7 +789,7 @@ int MPIR_Allgather_inter (
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -823,7 +823,7 @@ fn_fail:
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -904,7 +904,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLGATHER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c
index 674ba31..2af46b0 100644
--- a/src/mpi/coll/allgatherv.c
+++ b/src/mpi/coll/allgatherv.c
@@ -98,7 +98,7 @@ int MPIR_Allgatherv_intra (
const int *displs,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
MPI_Comm comm;
int comm_size, rank, j, i, left, right;
@@ -771,7 +771,7 @@ int MPIR_Allgatherv_inter (
const int *displs,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
/* Intercommunicator Allgatherv.
This is done differently from the intercommunicator allgather
@@ -894,7 +894,7 @@ int MPIR_Allgatherv_inter (
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -930,7 +930,7 @@ int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs,
- MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1015,7 +1015,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLGATHERV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c
index 5db6b6a..9f50e2e 100644
--- a/src/mpi/coll/allred_group.c
+++ b/src/mpi/coll/allred_group.c
@@ -9,7 +9,7 @@
int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- MPID_Group *group_ptr, int tag, int *errflag);
+ MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag);
/* Local utility macro: takes an two args and sets lvalue cr_ equal to the rank
* in comm_ptr corresponding to rvalue gr_ */
@@ -27,7 +27,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- MPID_Group *group_ptr, int tag, int *errflag)
+ MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag)
{
MPI_Aint type_size;
int mpi_errno = MPI_SUCCESS;
@@ -367,7 +367,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- MPID_Group *group_ptr, int tag, int *errflag)
+ MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c
index 2d6dee5..cfcc99d 100644
--- a/src/mpi/coll/allreduce.c
+++ b/src/mpi/coll/allreduce.c
@@ -149,7 +149,7 @@ MPIR_Op_check_dtype_fn *MPIR_Op_check_dtype_table[] = {
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int allreduce_intra_or_coll_fn(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -183,7 +183,7 @@ int MPIR_Allreduce_intra (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
#ifdef MPID_HAS_HETERO
int is_homogeneous;
@@ -626,7 +626,7 @@ int MPIR_Allreduce_inter (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
/* Intercommunicator Allreduce.
We first do intracommunicator reduces to rank 0 on left and right
@@ -719,7 +719,7 @@ int MPIR_Allreduce_inter (
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -750,7 +750,7 @@ fn_fail:
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -821,7 +821,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count,
static const char FCNAME[] = "MPI_Allreduce";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLREDUCE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c
index 0cae194..1ca98c6 100644
--- a/src/mpi/coll/alltoall.c
+++ b/src/mpi/coll/alltoall.c
@@ -135,7 +135,7 @@ int MPIR_Alltoall_intra(
int recvcount,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int comm_size, i, j, pof2;
MPI_Aint sendtype_extent, recvtype_extent;
@@ -629,7 +629,7 @@ int MPIR_Alltoall_inter(
int recvcount,
MPI_Datatype recvtype,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
/* Intercommunicator alltoall. We use a pairwise exchange algorithm
similar to the one used in intracommunicator alltoall for long
@@ -717,7 +717,7 @@ int MPIR_Alltoall_inter(
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -747,7 +747,7 @@ int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Alltoall != NULL) {
@@ -807,7 +807,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c
index 713b944..607cb3a 100644
--- a/src/mpi/coll/alltoallv.c
+++ b/src/mpi/coll/alltoallv.c
@@ -63,7 +63,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls
int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcounts,
const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int comm_size, i, j;
MPI_Aint send_extent, recv_extent;
@@ -240,7 +240,7 @@ fn_fail:
int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcounts,
const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator alltoallv. We use a pairwise exchange algorithm
similar to the one used in intracommunicator alltoallv. Since the
@@ -334,7 +334,7 @@ int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls,
- MPI_Datatype recvtype, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Datatype recvtype, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -365,7 +365,7 @@ int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispl
int MPIR_Alltoallv_impl(const void *sendbuf, const int *sendcounts, const int *sdispls,
MPI_Datatype sendtype, void *recvbuf, const int *recvcounts,
const int *rdispls, MPI_Datatype recvtype,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -440,7 +440,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALLV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c
index 31e7a1e..fa99a58 100644
--- a/src/mpi/coll/alltoallw.c
+++ b/src/mpi/coll/alltoallw.c
@@ -57,7 +57,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls
int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int sdispls[],
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
const int rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int comm_size, i, j;
int mpi_errno = MPI_SUCCESS;
@@ -240,7 +240,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int
int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int sdispls[],
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
const int rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator alltoallw. We use a pairwise exchange algorithm
similar to the one used in intracommunicator alltoallw. Since the
@@ -329,7 +329,7 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int
int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[],
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
const int rdispls[], const MPI_Datatype recvtypes[],
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -360,7 +360,7 @@ int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispl
int MPIR_Alltoallw_impl(const void *sendbuf, const int sendcounts[], const int sdispls[],
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
const int rdispls[], const MPI_Datatype recvtypes[],
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -435,7 +435,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[],
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALLW);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c
index 96813d8..8d4957a 100644
--- a/src/mpi/coll/barrier.c
+++ b/src/mpi/coll/barrier.c
@@ -67,7 +67,7 @@ int MPI_Barrier(MPI_Comm comm) __attribute__((weak,alias("PMPI_Barrier")));
#define FUNCNAME barrier_smp_intra
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-static int barrier_smp_intra(MPID_Comm *comm_ptr, int *errflag)
+static int barrier_smp_intra(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno=MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -128,7 +128,7 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, int *errflag)
#define FUNCNAME MPIR_Barrier_intra
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag )
+int MPIR_Barrier_intra( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
{
int size, rank, src, dst, mask, mpi_errno=MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -191,7 +191,7 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag )
#define FUNCNAME MPIR_Barrier_inter
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Barrier_inter( MPID_Comm *comm_ptr, int *errflag )
+int MPIR_Barrier_inter( MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
{
int rank, mpi_errno = MPI_SUCCESS, root;
int mpi_errno_ret = MPI_SUCCESS;
@@ -284,7 +284,7 @@ t-to-point messages.
#define FUNCNAME MPIR_Barrier
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Barrier(MPID_Comm *comm_ptr, int *errflag)
+int MPIR_Barrier(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -313,7 +313,7 @@ int MPIR_Barrier(MPID_Comm *comm_ptr, int *errflag)
#define FUNCNAME MPIR_Barrier_impl
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Barrier_impl(MPID_Comm *comm_ptr, int *errflag)
+int MPIR_Barrier_impl(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -375,7 +375,7 @@ int MPI_Barrier( MPI_Comm comm )
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BARRIER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/barrier_group.c b/src/mpi/coll/barrier_group.c
index e13fd07..f110328 100644
--- a/src/mpi/coll/barrier_group.c
+++ b/src/mpi/coll/barrier_group.c
@@ -13,7 +13,7 @@
This is an intracommunicator barrier only!
*/
-int MPIR_Barrier_group( MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, int *errflag )
+int MPIR_Barrier_group( MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, mpir_errflag_t *errflag )
{
int src = 0;
int dst, mpi_errno = MPI_SUCCESS;
diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c
index 7e42727..bbf6acc 100644
--- a/src/mpi/coll/bcast.c
+++ b/src/mpi/coll/bcast.c
@@ -127,7 +127,7 @@ static int MPIR_Bcast_binomial(
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int rank, comm_size, src, dst;
int relative_rank, mask;
@@ -340,7 +340,7 @@ static int scatter_for_bcast(
void *tmp_buf,
int is_contig,
int is_homogeneous,
- int *errflag)
+ mpir_errflag_t *errflag)
{
MPI_Status status;
int rank, comm_size, src, dst;
@@ -484,7 +484,7 @@ static int MPIR_Bcast_scatter_doubling_allgather(
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
MPI_Status status;
int rank, comm_size, dst;
@@ -794,7 +794,7 @@ static int MPIR_Bcast_scatter_ring_allgather(
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int rank, comm_size;
int mpi_errno = MPI_SUCCESS;
@@ -1002,7 +1002,7 @@ static int MPIR_SMP_Bcast(
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -1229,7 +1229,7 @@ int MPIR_Bcast_intra (
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -1353,7 +1353,7 @@ int MPIR_Bcast_inter (
MPI_Datatype datatype,
int root,
MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator broadcast.
Root sends to rank 0 in remote group. Remote group does local
@@ -1444,7 +1444,7 @@ fn_fail:
#define FUNCNAME MPIR_Bcast_impl
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, int *errflag)
+int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1476,7 +1476,7 @@ int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MP
#define FUNCNAME MPIR_Bcast
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, int *errflag)
+inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1535,7 +1535,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BCAST);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c
index a83a543..86b8f14 100644
--- a/src/mpi/coll/exscan.c
+++ b/src/mpi/coll/exscan.c
@@ -91,7 +91,7 @@ int MPIR_Exscan (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
MPI_Status status;
int rank, comm_size;
@@ -240,7 +240,7 @@ fn_fail:
#define FUNCNAME MPIR_Exscan_impl
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -307,7 +307,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_EXSCAN);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c
index cb87ef2..81bb78f 100644
--- a/src/mpi/coll/gather.c
+++ b/src/mpi/coll/gather.c
@@ -87,7 +87,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,
int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int comm_size, rank;
int mpi_errno = MPI_SUCCESS;
@@ -492,7 +492,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,
int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator gather.
For short messages, remote group does a local intracommunicator
@@ -664,7 +664,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -698,7 +698,7 @@ int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Gather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -764,7 +764,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GATHER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c
index 48a265c..cc7a54a 100644
--- a/src/mpi/coll/gatherv.c
+++ b/src/mpi/coll/gatherv.c
@@ -83,7 +83,7 @@ int MPIR_Gatherv (
MPI_Datatype recvtype,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int comm_size, rank;
int mpi_errno = MPI_SUCCESS;
@@ -219,7 +219,7 @@ fn_fail:
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Gatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -289,7 +289,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GATHERV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c
index 7c5a2aa..243d2a0 100644
--- a/src/mpi/coll/helper_fns.c
+++ b/src/mpi/coll/helper_fns.c
@@ -252,7 +252,7 @@ int MPIC_Wait(MPID_Request * request_ptr)
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, int *errflag)
+ MPI_Comm comm, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int context_id;
@@ -262,13 +262,19 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t
MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SEND);
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "IN: errflag = %d", *errflag);
MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", count);
- if (*errflag)
- MPIR_TAG_SET_ERROR_BIT(tag);
+ switch(*errflag) {
+ case MPIR_ERR_NONE:
+ break;
+ case MPIR_ERR_PROC_FAILED:
+ MPIR_TAG_SET_PROC_FAILURE_BIT(tag);
+ case MPIR_ERR_OTHER:
+ MPIR_TAG_SET_ERROR_BIT(tag);
+ }
MPID_Comm_get_ptr(comm, comm_ptr);
context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
@@ -298,7 +304,7 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
- MPI_Comm comm, MPI_Status *status, int *errflag)
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int context_id;
@@ -309,7 +315,7 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
MPIDI_FUNC_ENTER(MPID_STATE_MPIC_RECV);
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "IN: errflag = %d", *errflag);
MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", count);
@@ -338,15 +344,20 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
if (MPIX_ERR_REVOKED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
- *errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ if (MPIR_TAG_CHECK_PROC_FAILURE_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_PROC_FAILED;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ } else if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_OTHER;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ }
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == tag);
}
}
fn_exit:
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "OUT: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "OUT: errflag = %d", *errflag);
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_RECV);
return mpi_errno;
fn_fail:
@@ -361,7 +372,7 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, int *errflag)
+ MPI_Comm comm, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int context_id;
@@ -371,7 +382,7 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int
MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SSEND);
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "IN: errflag = %d", *errflag);
MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", count);
@@ -409,7 +420,7 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int
int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int dest, int sendtag, void *recvbuf, int recvcount,
MPI_Datatype recvtype, int source, int recvtag,
- MPI_Comm comm, MPI_Status *status, int *errflag)
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int context_id;
@@ -432,7 +443,14 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL;
if (status == MPI_STATUS_IGNORE) status = &mystatus;
- if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
+ switch(*errflag) {
+ case MPIR_ERR_NONE:
+ break;
+ case MPIR_ERR_PROC_FAILED:
+ MPIR_TAG_SET_PROC_FAILURE_BIT(sendtag);
+ case MPIR_ERR_OTHER:
+ MPIR_TAG_SET_ERROR_BIT(sendtag);
+ }
mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag,
comm_ptr, context_id, &recv_req_ptr);
@@ -456,15 +474,21 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (MPIX_ERR_REVOKED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
- *errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ if (MPIR_TAG_CHECK_PROC_FAILURE_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_PROC_FAILED;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ } else if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_OTHER;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ }
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == recvtag);
}
}
+
fn_exit:
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "OUT: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "OUT: errflag = %d", *errflag);
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_SENDRECV);
return mpi_errno;
@@ -482,7 +506,7 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
int dest, int sendtag,
int source, int recvtag,
- MPI_Comm comm, MPI_Status *status, int *errflag)
+ MPI_Comm comm, MPI_Status *status, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
MPI_Status mystatus;
@@ -502,13 +526,20 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SENDRECV_REPLACE);
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "IN: errflag = %d", *errflag);
MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", count);
if (status == MPI_STATUS_IGNORE) status = &mystatus;
- if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag);
+ switch(*errflag) {
+ case MPIR_ERR_NONE:
+ break;
+ case MPIR_ERR_PROC_FAILED:
+ MPIR_TAG_SET_PROC_FAILURE_BIT(sendtag);
+ case MPIR_ERR_OTHER:
+ MPIR_TAG_SET_ERROR_BIT(sendtag);
+ }
MPID_Comm_get_ptr(comm, comm_ptr);
context_id_offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
@@ -572,16 +603,22 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
if (MPIX_ERR_REVOKED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
- *errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ if (MPIR_TAG_CHECK_PROC_FAILURE_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_PROC_FAILED;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ } else if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
+ *errflag = MPIR_ERR_OTHER;
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
+ }
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == recvtag);
}
}
+
fn_exit:
MPIU_CHKLMEM_FREEALL();
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "OUT: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "OUT: errflag = %d", *errflag);
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_SENDRECV_REPLACE);
return mpi_errno;
fn_fail:
@@ -593,7 +630,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag,
- MPI_Comm comm, MPI_Request *request, int *errflag)
+ MPI_Comm comm, MPI_Request *request, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int context_id;
@@ -603,13 +640,19 @@ int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int
MPIDI_FUNC_ENTER(MPID_STATE_MPIC_ISEND);
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "IN: errflag = %d", *errflag);
MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT,
"**countneg", "**countneg %d", count);
- if (*errflag)
- MPIR_TAG_SET_ERROR_BIT(tag);
+ switch(*errflag) {
+ case MPIR_ERR_NONE:
+ break;
+ case MPIR_ERR_PROC_FAILED:
+ MPIR_TAG_SET_PROC_FAILURE_BIT(tag);
+ case MPIR_ERR_OTHER:
+ MPIR_TAG_SET_ERROR_BIT(tag);
+ }
MPID_Comm_get_ptr(comm, comm_ptr);
context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ?
@@ -668,7 +711,7 @@ int MPIC_Irecv(void *buf, int count, MPI_Datatype datatype, int source,
#define FUNCNAME MPIC_Waitall
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int *errflag)
+int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int i;
@@ -692,15 +735,19 @@ int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int
if (*errflag) goto fn_exit;
for (i = 0; i < numreq; ++i) {
- if (MPIR_TAG_CHECK_ERROR_BIT(statuses[i].MPI_TAG)) {
- *errflag = TRUE;
+ if (MPIR_TAG_CHECK_PROC_FAILURE_BIT(statuses[i].MPI_TAG)) {
+ *errflag = MPIR_ERR_PROC_FAILED;
+ MPIR_TAG_CLEAR_ERROR_BITS(statuses[i].MPI_TAG);
+ break;
+ } else if (MPIR_TAG_CHECK_ERROR_BIT(statuses[i].MPI_TAG)) {
+ *errflag = MPIR_ERR_OTHER;
MPIR_TAG_CLEAR_ERROR_BITS(statuses[i].MPI_TAG);
break;
}
}
fn_exit:
- MPIU_DBG_MSG_S(PT2PT, TYPICAL, "OUT: errflag = %s", *errflag?"TRUE":"FALSE");
+ MPIU_DBG_MSG_D(PT2PT, TYPICAL, "OUT: errflag = %d", *errflag);
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_WAITALL);
return mpi_errno;
fn_fail:
diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c
index 46949f6..afc3255 100644
--- a/src/mpi/coll/red_scat.c
+++ b/src/mpi/coll/red_scat.c
@@ -57,7 +57,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[
#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const int recvcounts[],
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -241,7 +241,7 @@ fn_fail:
/* not declared static because a machine-specific function may call this one in some cases */
int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recvcounts[],
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
@@ -897,7 +897,7 @@ fn_fail:
/* not declared static because a machine-specific function may call this one in some cases */
int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recvcounts[],
MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator Reduce_scatter.
We first do an intercommunicator reduce to rank 0 on left group,
@@ -1027,7 +1027,7 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[],
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1058,7 +1058,7 @@ int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce_scatter_impl(const void *sendbuf, void *recvbuf, const int recvcounts[],
- MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1123,7 +1123,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_SCATTER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c
index 45b6b30..a19709f 100644
--- a/src/mpi/coll/red_scat_block.c
+++ b/src/mpi/coll/red_scat_block.c
@@ -53,7 +53,7 @@ static int MPIR_Reduce_scatter_block_noncomm (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -241,7 +241,7 @@ int MPIR_Reduce_scatter_block_intra (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
@@ -874,7 +874,7 @@ int MPIR_Reduce_scatter_block_inter (
int recvcount,
MPI_Datatype datatype,
MPI_Op op,
- MPID_Comm *comm_ptr, int *errflag )
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag )
{
/* Intercommunicator Reduce_scatter_block.
We first do an intercommunicator reduce to rank 0 on left group,
@@ -995,7 +995,7 @@ int MPIR_Reduce_scatter_block_inter (
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf,
int recvcount, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1026,7 +1026,7 @@ int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf,
int recvcount, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1095,7 +1095,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_SCATTER_BLOCK);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c
index ff482f2..2e56814 100644
--- a/src/mpi/coll/reduce.c
+++ b/src/mpi/coll/reduce.c
@@ -84,7 +84,7 @@ static int MPIR_Reduce_binomial (
MPI_Op op,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -292,7 +292,7 @@ static int MPIR_Reduce_redscat_gather (
MPI_Op op,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -723,7 +723,7 @@ int MPIR_Reduce_intra (
MPI_Op op,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -914,7 +914,7 @@ int MPIR_Reduce_inter (
MPI_Op op,
int root,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
/* Intercommunicator reduce.
Remote group does a local intracommunicator
@@ -1026,7 +1026,7 @@ int MPIR_Reduce_inter (
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1057,7 +1057,7 @@ int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, int root, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1132,7 +1132,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c
index c9965e2..6aa9372 100644
--- a/src/mpi/coll/scan.c
+++ b/src/mpi/coll/scan.c
@@ -76,7 +76,7 @@ static int MPIR_Scan_generic (
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
MPI_Status status;
int rank, comm_size;
@@ -230,7 +230,7 @@ int MPIR_Scan(
MPI_Datatype datatype,
MPI_Op op,
MPID_Comm *comm_ptr,
- int *errflag )
+ mpir_errflag_t *errflag )
{
int mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -429,7 +429,7 @@ int MPIR_Scan(
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
- MPI_Op op, MPID_Comm *comm_ptr, int *errflag)
+ MPI_Op op, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -492,7 +492,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCAN);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c
index 852861f..65edd74 100644
--- a/src/mpi/coll/scatter.c
+++ b/src/mpi/coll/scatter.c
@@ -74,7 +74,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype, int root,
- MPID_Comm *comm_ptr, int *errflag)
+ MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
MPI_Status status;
MPI_Aint extent=0;
@@ -424,7 +424,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf,
int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr,
- int *errflag)
+ mpir_errflag_t *errflag)
{
/* Intercommunicator scatter.
For short messages, root sends to rank 0 in remote group. rank 0
@@ -577,7 +577,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -612,7 +612,7 @@ int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -677,7 +677,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCATTER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c
index 485fde8..f283679 100644
--- a/src/mpi/coll/scatterv.c
+++ b/src/mpi/coll/scatterv.c
@@ -55,7 +55,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int rank, comm_size, mpi_errno = MPI_SUCCESS;
int mpi_errno_ret = MPI_SUCCESS;
@@ -168,7 +168,7 @@ fn_fail:
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Scatterv_impl(const void *sendbuf, const int *sendcounts, const int *displs,
MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype,
- int root, MPID_Comm *comm_ptr, int *errflag)
+ int root, MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -236,7 +236,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCATTERV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c
index 49a71d7..9c5f669 100644
--- a/src/mpi/comm/comm_agree.c
+++ b/src/mpi/comm/comm_agree.c
@@ -34,7 +34,7 @@ int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag)
int mpi_errno = MPI_SUCCESS, mpi_errno_tmp = MPI_SUCCESS;
MPID_Group *comm_grp, *failed_grp, *new_group_ptr, *global_failed;
int result, success = 1;
- int errflag = 0;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int values[2];
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_AGREE);
diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c
index 3825f6f..abcddde 100644
--- a/src/mpi/comm/comm_create.c
+++ b/src/mpi/comm/comm_create.c
@@ -320,7 +320,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr
int rinfo[2];
MPID_VCR *mapping_vcr = NULL;
MPID_VCR *remote_mapping_vcr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(1);
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_CREATE_INTER);
diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c
index 844d617..6bdd987 100644
--- a/src/mpi/comm/comm_shrink.c
+++ b/src/mpi/comm/comm_shrink.c
@@ -50,7 +50,7 @@ int MPIR_Comm_shrink(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr)
int mpi_errno = MPI_SUCCESS;
MPID_Group *global_failed, *comm_grp, *new_group_ptr;
int attempts = 0;
- int errflag = 0, tmp_errflag = 0;
+ mpir_errflag_t errflag = MPIR_ERR_NONE, tmp_errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_SHRINK);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_SHRINK);
diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c
index 6a60d28..31db2da 100644
--- a/src/mpi/comm/comm_split.c
+++ b/src/mpi/comm/comm_split.c
@@ -137,7 +137,7 @@ int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **ne
first_entry = 0, first_remote_entry = 0, *last_ptr;
int in_newcomm; /* TRUE iff *newcomm should be populated */
MPIR_Context_id_t new_context_id, remote_context_id;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(4);
rank = comm_ptr->rank;
diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c
index 60db478..171b9d2 100644
--- a/src/mpi/comm/commutil.c
+++ b/src/mpi/comm/commutil.c
@@ -878,7 +878,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr,
{
int mpi_errno = MPI_SUCCESS;
uint32_t local_mask[MPIR_MAX_CONTEXT_MASK];
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_GET_CONTEXTID);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_GET_CONTEXTID);
@@ -985,7 +985,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr,
uint32_t local_mask[MPIR_MAX_CONTEXT_MASK+1];
int own_mask = 0;
int own_eager_mask = 0;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int first_iter = 1;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_GET_CONTEXTID);
@@ -1611,7 +1611,7 @@ int MPIR_Get_intercomm_contextid( MPID_Comm *comm_ptr, MPIR_Context_id_t *contex
context instead?. Or can we use the tag
provided in the intercomm routine? (not on a dup,
but in that case it can use the collective context) */
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_GET_INTERCOMM_CONTEXTID);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_GET_INTERCOMM_CONTEXTID);
diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c
index b0a9c6e..41d1a34 100644
--- a/src/mpi/comm/intercomm_create.c
+++ b/src/mpi/comm/intercomm_create.c
@@ -191,7 +191,7 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader,
int is_low_group = 0;
int cts_tag;
int i;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(4);
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INTERCOMM_CREATE_IMPL);
diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c
index e12d991..db320de 100644
--- a/src/mpi/comm/intercomm_merge.c
+++ b/src/mpi/comm/intercomm_merge.c
@@ -91,7 +91,7 @@ int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_int
int mpi_errno = MPI_SUCCESS;
int local_high, remote_high, new_size;
MPIR_Context_id_t new_context_id;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INTERCOMM_MERGE_IMPL);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_INTERCOMM_MERGE_IMPL);
@@ -326,7 +326,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm)
MPID_BEGIN_ERROR_CHECKS;
{
int acthigh;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
/* Check for consistent valus of high in each local group.
The Intel test suite checks for this; it is also an easy
error to make */
diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c
index e8ec351..5913b01 100644
--- a/src/mpi/topo/dist_gr_create.c
+++ b/src/mpi/topo/dist_gr_create.c
@@ -92,7 +92,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[],
int *rout_idx;
int *rs;
int in_out_peers[2] = {-1, -1};
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(9);
MPIU_CHKPMEM_DECL(1);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_CREATE);
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
index bff1b52..fa4d906 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
@@ -63,7 +63,7 @@ fn_fail:
int MPIDI_CH3_SHM_Win_free(MPID_Win **win_ptr)
{
int mpi_errno = MPI_SUCCESS;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_SHM_WIN_FREE);
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3_SHM_WIN_FREE);
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
index c786dcb..f8f5f27 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
@@ -60,7 +60,7 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi
MPID_Comm *node_comm_ptr = NULL, *shm_node_comm_ptr = NULL;
int *node_ranks = NULL, *node_ranks_in_shm_node = NULL;
MPID_Group *node_group_ptr = NULL, *shm_node_group_ptr = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPI_Aint *base_shm_offs;
MPIDI_SHM_Win_t *elem = shm_wins_list;
@@ -266,7 +266,7 @@ static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info *
MPI_Aint *node_sizes;
void **node_shm_base_addrs;
MPI_Aint *tmp_buf;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int noncontig = FALSE;
MPIU_CHKPMEM_DECL(6);
MPIU_CHKLMEM_DECL(3);
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
index ebddf1d..01f43c2 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
@@ -11,7 +11,7 @@
#define NULL_CONTEXT_ID -1
-static int barrier (MPID_Comm *comm_ptr, int *errflag);
+static int barrier (MPID_Comm *comm_ptr, mpir_errflag_t *errflag);
static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars);
UT_array *coll_fns_array = NULL;
@@ -161,7 +161,7 @@ static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars)
#define FUNCNAME barrier
#undef FCNAME
#define FCNAME MPIDI_QUOTE(FUNCNAME)
-static int barrier(MPID_Comm *comm_ptr, int *errflag)
+static int barrier(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
MPID_nem_barrier_vars_t *barrier_vars;
diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
index 458ae96..743ce74 100644
--- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
+++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
@@ -256,7 +256,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands,
}
if (errcodes != MPI_ERRCODES_IGNORE) {
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
mpi_errno = MPIR_Bcast_impl(&should_accept, 1, MPI_INT, root, comm_ptr, &errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c
index 6bad491..cb6a1dc 100644
--- a/src/mpid/ch3/src/ch3u_port.c
+++ b/src/mpid/ch3/src/ch3u_port.c
@@ -349,7 +349,7 @@ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root,
pg_node *pg_list = NULL;
MPIDI_PG_t **remote_pg = NULL;
MPIR_Context_id_t recvcontext_id = MPIR_INVALID_CONTEXT_ID;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(3);
MPIDI_STATE_DECL(MPID_STATE_MPIDI_COMM_CONNECT);
@@ -695,7 +695,7 @@ static int ReceivePGAndDistribute( MPID_Comm *tmp_comm, MPID_Comm *comm_ptr,
int rank = comm_ptr->rank;
int mpi_errno = 0;
int recvtag = *recvtag_p;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIDI_STATE_DECL(MPID_STATE_RECEIVEPGANDDISTRIBUTE);
MPIDI_FUNC_ENTER(MPID_STATE_RECEIVEPGANDDISTRIBUTE);
@@ -771,7 +771,7 @@ int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root )
pg_translation *local_translation = 0;
pg_node *pg_list, *pg_next, *pg_head = 0;
int rank, i, peer_comm_size;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(1);
peer_comm_size = comm_p->local_size;
@@ -875,7 +875,7 @@ static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p,
int mpi_errno = 0;
int sendtag = *sendtag_p, i;
pg_node *pg_iter;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIDI_STATE_DECL(MPID_STATE_SENDPGTOPEERANDFREE);
MPIDI_FUNC_ENTER(MPID_STATE_SENDPGTOPEERANDFREE);
@@ -944,7 +944,7 @@ int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root,
pg_translation *local_translation = NULL, *remote_translation = NULL;
pg_node *pg_list = NULL;
MPIDI_PG_t **remote_pg = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(3);
MPIDI_STATE_DECL(MPID_STATE_MPIDI_COMM_ACCEPT);
@@ -1154,7 +1154,7 @@ static int SetupNewIntercomm( MPID_Comm *comm_ptr, int remote_comm_size,
MPID_Comm *intercomm )
{
int mpi_errno = MPI_SUCCESS, i;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
/* FIXME: How much of this could/should be common with the
upper level (src/mpi/comm/ *.c) code? For best robustness,
this should use the same routine (not copy/paste code) as
diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c
index 312c2a9..48ba649 100644
--- a/src/mpid/ch3/src/ch3u_recvq.c
+++ b/src/mpid/ch3/src/ch3u_recvq.c
@@ -766,7 +766,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
MPID_Request * rreq;
MPID_Request * prev_rreq;
int channel_matched;
- int error_bit_masked = 0;
+ int error_bit_masked = 0, proc_failure_bit_masked = 0;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FDP_OR_AEU);
MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_RECVQ_FDP_OR_AEU);
@@ -777,8 +777,9 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
* have to mask it every time. It will get reset at the end of the loop or
* before the request is added to the unexpected queue if was set here. */
if (MPIR_TAG_CHECK_ERROR_BIT(match->parts.tag)) {
- MPIR_TAG_CLEAR_ERROR_BITS(match->parts.tag);
error_bit_masked = 1;
+ if (MPIR_TAG_CHECK_PROC_FAILURE_BIT(match->parts.tag)) proc_failure_bit_masked = 1;
+ MPIR_TAG_CLEAR_ERROR_BITS(match->parts.tag);
}
top_loop:
@@ -843,9 +844,9 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
found=FALSE;goto lock_exit );
MPIU_Assert(mpi_errno == 0);
rreq->dev.recv_pending_count = 1;
- /* Reset the error bit if we unset it earlier. */
- if (error_bit_masked)
- MPIR_TAG_SET_ERROR_BIT(match->parts.tag);
+ /* Reset the error bits if we unset it earlier. */
+ if (error_bit_masked) MPIR_TAG_SET_ERROR_BIT(match->parts.tag);
+ if (proc_failure_bit_masked) MPIR_TAG_SET_PROC_FAILURE_BIT(match->parts.tag);
rreq->dev.match = *match;
rreq->dev.next = NULL;
if (recvq_unexpected_tail != NULL) {
@@ -862,9 +863,9 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
lock_exit:
- /* Reset the error bit if we unset it earlier. */
- if (error_bit_masked)
- MPIR_TAG_SET_ERROR_BIT(match->parts.tag);
+ /* Reset the error bits if we unset it earlier. */
+ if (error_bit_masked) MPIR_TAG_SET_ERROR_BIT(match->parts.tag);
+ if (proc_failure_bit_masked) MPIR_TAG_SET_PROC_FAILURE_BIT(match->parts.tag);
*foundp = found;
diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index aea2190..c1a2c01 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -290,7 +290,7 @@ int MPIDI_Win_fence(int assert, MPID_Win * win_ptr)
int i, made_progress = 0;
int local_completed = 0, remote_completed = 0;
MPIDI_RMA_Target_t *curr_target = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int mpi_errno = MPI_SUCCESS;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_WIN_FENCE);
diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c
index 7beaafe..534516e 100644
--- a/src/mpid/ch3/src/ch3u_win_fns.c
+++ b/src/mpid/ch3/src/ch3u_win_fns.c
@@ -41,7 +41,7 @@ int MPIDI_CH3U_Win_create_gather( void *base, MPI_Aint size, int disp_unit,
{
int mpi_errno=MPI_SUCCESS, i, k, comm_size, rank;
MPI_Aint *tmp_buf;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKPMEM_DECL(5);
MPIU_CHKLMEM_DECL(1);
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE_GATHER);
diff --git a/src/mpid/ch3/src/mpid_comm_agree.c b/src/mpid/ch3/src/mpid_comm_agree.c
index 3bd5849..5e77d52 100644
--- a/src/mpid/ch3/src/mpid_comm_agree.c
+++ b/src/mpid/ch3/src/mpid_comm_agree.c
@@ -56,12 +56,12 @@ static void get_children(int rank, int size, uint32_t *bitarray, int *children,
#define FUNCNAME MPID_Comm_agree
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_fail)
+int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, mpir_errflag_t new_fail)
{
int mpi_errno = MPI_SUCCESS;
int *children, nchildren = 0, parent;
int i;
- int errflag = new_fail;
+ mpir_errflag_t errflag = new_fail;
int tmp_flag;
MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_AGREE);
diff --git a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c
index 98e8230..4cacc76 100644
--- a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c
+++ b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c
@@ -84,7 +84,7 @@ static MPID_Group *bitarray_to_group(MPID_Comm *comm_ptr, uint32_t *bitarray)
int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_group, int tag)
{
int mpi_errno = MPI_SUCCESS;
- int errflag = 0;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int i, j, bitarray_size;
uint32_t *bitarray, *remote_bitarray;
MPID_Group *local_fail;
diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c
index c5d9a48..b340534 100644
--- a/src/mpid/ch3/src/mpid_vc.c
+++ b/src/mpid/ch3/src/mpid_vc.c
@@ -595,7 +595,7 @@ int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr,
int i, allfound = 1, pgid, pgidWorld;
MPIDI_PG_t *pg = 0;
MPIDI_PG_iterator iter;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
/* Get the pgid for CommWorld (always attached to the first process
group) */
diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c
index f585656..616f5ed 100644
--- a/src/mpid/ch3/src/mpidi_rma.c
+++ b/src/mpid/ch3/src/mpidi_rma.c
@@ -145,7 +145,7 @@ int MPIDI_Win_free(MPID_Win ** win_ptr)
int mpi_errno = MPI_SUCCESS;
int in_use;
MPID_Comm *comm_ptr;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIDI_RMA_Win_list_t *win_elem;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_WIN_FREE);
diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
index 669158a..57a519a 100644
--- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
+++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c
@@ -201,7 +201,7 @@ int MPID_Comm_disconnect(MPID_Comm *comm_ptr)
int rc, i,j, k, ref_count,mpi_errno=0, probe_flag=0;
pami_task_t *local_list;
MPI_Status status;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIDI_PG_t *pg;
int total_leaders=0, gsize;
pami_task_t *leader_tids;
diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c
index 2b4bd86..81d6298 100644
--- a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c
+++ b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c
@@ -298,7 +298,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands,
}
if (errcodes != MPI_ERRCODES_IGNORE) {
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
mpi_errno = MPIR_Bcast_impl(&should_accept, 1, MPI_INT, root, comm_ptr, &errflag);
if (mpi_errno) TRACE_ERR("MPIR_Bcast_impl returned with mpi_errno=%d\n", mpi_errno);
diff --git a/src/mpid/pamid/src/dyntask/mpidi_pg.c b/src/mpid/pamid/src/dyntask/mpidi_pg.c
index 7d59b3a..f022d9a 100644
--- a/src/mpid/pamid/src/dyntask/mpidi_pg.c
+++ b/src/mpid/pamid/src/dyntask/mpidi_pg.c
@@ -1011,7 +1011,7 @@ int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr,
int i, allfound = 1, pgid, pgidWorld;
MPIDI_PG_t *pg = 0;
MPIDI_PG_iterator iter;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
if(mpidi_dynamic_tasking) {
/* Get the pgid for CommWorld (always attached to the first process
diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c
index 2488ed6..092d2dd 100644
--- a/src/mpid/pamid/src/dyntask/mpidi_port.c
+++ b/src/mpid/pamid/src/dyntask/mpidi_port.c
@@ -510,7 +510,7 @@ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root,
pg_node *pg_list = NULL;
MPIDI_PG_t **remote_pg = NULL;
MPIR_Context_id_t recvcontext_id = MPIR_INVALID_CONTEXT_ID;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
long long comm_cntr, lcomm_cntr;
/* Get the context ID here because we need to send it to the remote side */
@@ -815,7 +815,7 @@ static int MPIDI_ReceivePGAndDistribute( struct MPID_Comm *tmp_comm, struct MPID
int rank = comm_ptr->rank;
int mpi_errno = 0;
int recvtag = *recvtag_p;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
TRACE_ERR("MPIDI_ReceivePGAndDistribute - n_remote_pgs=%d\n", n_remote_pgs);
for (i=0; i<n_remote_pgs; i++) {
@@ -1088,7 +1088,7 @@ static int MPIDI_SendPGtoPeerAndFree( struct MPID_Comm *tmp_comm, int *sendtag_p
int mpi_errno = 0;
int sendtag = *sendtag_p, i;
pg_node *pg_iter;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
while (pg_list != NULL) {
pg_iter = pg_list;
@@ -1149,7 +1149,7 @@ int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root,
pg_translation *local_translation = NULL, *remote_translation = NULL;
pg_node *pg_list = NULL;
MPIDI_PG_t **remote_pg = NULL;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
char send_char[16], recv_char[16], remote_taskids[16];
long long comm_cntr, lcomm_cntr;
int leader_taskid;
@@ -1384,7 +1384,7 @@ static int MPIDI_SetupNewIntercomm( struct MPID_Comm *comm_ptr, int remote_comm_
struct MPID_Comm *intercomm )
{
int mpi_errno = MPI_SUCCESS, i, j, index=0;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int total_rem_world_cnts, p=0;
char *world_tasks, *cp1;
conn_info *tmp_node;
@@ -1683,7 +1683,7 @@ int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root )
pg_translation *local_translation = 0;
pg_node *pg_list, *pg_next, *pg_head = 0;
int rank, i, peer_comm_size;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPIU_CHKLMEM_DECL(1);
peer_comm_size = comm_p->local_size;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
index d521a26..ecce9ce 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -159,7 +159,7 @@ MPID_getSharedSegment_mmap(MPID_Win * win)
{
int rank, rc, fd;
int mpi_errno = MPI_SUCCESS;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
int first = 0;
snprintf (win->mpid.shm->shm_key, 63, "/mpich.comm-%d.win_shared", win->comm_ptr->context_id);
@@ -205,7 +205,7 @@ int
MPID_getSharedSegment_sysv(MPID_Win * win)
{
int mpi_errno = MPI_SUCCESS;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
uint32_t shm_key;
int rank;
char *cp;
@@ -308,7 +308,7 @@ MPID_getSharedSegment(MPI_Aint size,
{
int mpi_errno = MPI_SUCCESS;
int i, comm_size, rank;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
MPI_Aint pageSize,pageSize2, len,new_size;
MPID_Win *win;
int padSize;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c
index 9c57553..ecd1df3 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_free.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_free.c
@@ -83,7 +83,7 @@ MPID_Win_free(MPID_Win **win_ptr)
MPID_Win *win = *win_ptr;
size_t rank = win->comm_ptr->rank;
- int errflag = FALSE;
+ mpir_errflag_t errflag = MPIR_ERR_NONE;
if(win->mpid.sync.origin_epoch_type != win->mpid.sync.target_epoch_type ||
(win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_NONE &&
http://git.mpich.org/mpich.git/commitdiff/46f59276bcfce78af04215bfa8cf544d0cef079f
commit 46f59276bcfce78af04215bfa8cf544d0cef079f
Author: Wesley Bland <wbland at anl.gov>
Date: Mon Nov 10 10:17:25 2014 -0600
Take a bit in the tag space for proc failure
We need to take another bit from the tag space to specify the difference
between a generic failure and a process failure. This patch modifies the
macros to handle this situation.
Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 97e785f..5dd363f 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -3898,18 +3898,29 @@ int MPID_VCR_Get_lpid(MPID_VCR vcr, int * lpid_ptr);
* be necessary to do so (for instance in the receive queue */
#define MPIR_TAG_ERROR_BIT (1 << 30)
+/* This bitmask is used to differentiate between a process failure
+ * (MPIX_ERR_PROC_FAILED) and any other kind of failure (MPI_ERR_OTHER). */
+#define MPIR_TAG_PROC_FAILURE_BIT (1 << 29)
+
/* This macro checks the value of the error bit in the MPI tag and returns 1
* if the tag is set and 0 if it is not. */
-#define MPIR_TAG_CHECK_ERROR_BIT(tag) ((MPIR_TAG_ERROR_BIT & tag) == MPIR_TAG_ERROR_BIT ? 1 : 0)
+#define MPIR_TAG_CHECK_ERROR_BIT(tag) ((MPIR_TAG_ERROR_BIT & (tag)) == MPIR_TAG_ERROR_BIT ? 1 : 0)
+
+/* This macro checks the value of the process failure bit in the MPI tag and
+ * returns 1 if the tag is set and 0 if it is not. */
+#define MPIR_TAG_CHECK_PROC_FAILURE_BIT(tag) ((MPIR_TAG_PROC_FAILURE_BIT & (tag)) == MPIR_TAG_PROC_FAILURE_BIT ? 1 : 0)
/* This macro sets the value of the error bit in the MPI tag to 1 */
-#define MPIR_TAG_SET_ERROR_BIT(tag) (tag |= MPIR_TAG_ERROR_BIT)
+#define MPIR_TAG_SET_ERROR_BIT(tag) ((tag) |= MPIR_TAG_ERROR_BIT)
+
+/* This macro sets the value of the process failure bit in the MPI tag to 1 */
+#define MPIR_TAG_SET_PROC_FAILURE_BIT(tag) ((tag) |= (MPIR_TAG_ERROR_BIT | MPIR_TAG_PROC_FAILURE_BIT))
-/* This macro clears the value of the error bit in the MPI tag */
-#define MPIR_TAG_CLEAR_ERROR_BIT(tag) (tag &= ~MPIR_TAG_ERROR_BIT)
+/* This macro clears the value of the error bits in the MPI tag */
+#define MPIR_TAG_CLEAR_ERROR_BITS(tag) ((tag) &= ~(MPIR_TAG_ERROR_BIT ^ MPIR_TAG_PROC_FAILURE_BIT))
-/* This macro masks the value of the error bit in the MPI tag */
-#define MPIR_TAG_MASK_ERROR_BIT(tag) (tag & ~MPIR_TAG_ERROR_BIT)
+/* This macro masks the value of the error bits in the MPI tag */
+#define MPIR_TAG_MASK_ERROR_BITS(tag) ((tag) & ~(MPIR_TAG_ERROR_BIT ^ MPIR_TAG_PROC_FAILURE_BIT))
/* These functions are used in the implementation of collective and
other internal operations. They are wrappers around MPID send/recv
diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c
index 32f0284..7c5a2aa 100644
--- a/src/mpi/coll/helper_fns.c
+++ b/src/mpi/coll/helper_fns.c
@@ -339,7 +339,7 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag,
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
*errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BIT(status->MPI_TAG);
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == tag);
}
@@ -457,7 +457,7 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
*errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BIT(status->MPI_TAG);
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == recvtag);
}
@@ -573,7 +573,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(status->MPI_ERROR) ||
MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) {
*errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BIT(status->MPI_TAG);
+ MPIR_TAG_CLEAR_ERROR_BITS(status->MPI_TAG);
} else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) {
MPIU_Assert(status->MPI_TAG == recvtag);
}
@@ -694,7 +694,7 @@ int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int
for (i = 0; i < numreq; ++i) {
if (MPIR_TAG_CHECK_ERROR_BIT(statuses[i].MPI_TAG)) {
*errflag = TRUE;
- MPIR_TAG_CLEAR_ERROR_BIT(statuses[i].MPI_TAG);
+ MPIR_TAG_CLEAR_ERROR_BITS(statuses[i].MPI_TAG);
break;
}
}
diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c
index a7d65ba..aaf20c8 100644
--- a/src/mpi/init/initthread.c
+++ b/src/mpi/init/initthread.c
@@ -501,7 +501,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided)
MPIU_Assert(((unsigned)MPIR_Process.attrs.tag_ub & ((unsigned)MPIR_Process.attrs.tag_ub + 1)) == 0);
/* Set aside tag space for tagged collectives and failure notification */
- MPIR_Process.attrs.tag_ub >>= 2;
+ MPIR_Process.attrs.tag_ub >>= 3;
/* The bit for error checking is set in a macro in mpiimpl.h for
* performance reasons. */
MPIR_Process.tagged_coll_mask = MPIR_Process.attrs.tag_ub + 1;
diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c
index bf59978..312c2a9 100644
--- a/src/mpid/ch3/src/ch3u_recvq.c
+++ b/src/mpid/ch3/src/ch3u_recvq.c
@@ -232,7 +232,7 @@ int MPIDI_CH3U_Recvq_FU(int source, int tag, int context_id, MPI_Status *s)
/* Mask the error bit that might be set on incoming messages. It is
* assumed that the local receive operation won't have the error bit set
* (or it is masked away at some other level). */
- MPIR_TAG_CLEAR_ERROR_BIT(mask.parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(mask.parts.tag);
if (tag != MPI_ANY_TAG && source != MPI_ANY_SOURCE) {
MPIR_T_PVAR_TIMER_START(RECVQ, time_matching_unexpectedq);
while (rreq != NULL) {
@@ -315,7 +315,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id,
/* Mask the error bit that might be set on incoming messages. It is
* assumed that the local receive operation won't have the error bit set
* (or it is masked away at some other level). */
- MPIR_TAG_CLEAR_ERROR_BIT(mask.parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(mask.parts.tag);
/* Note that since this routine is used only in the case of send_cancel,
there can be only one match if at all. */
@@ -399,7 +399,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_i
/* Mask the error bit that might be set on incoming messages. It is
* assumed that the local receive operation won't have the error bit set
* (or it is masked away at some other level). */
- MPIR_TAG_CLEAR_ERROR_BIT(mask.parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(mask.parts.tag);
if (tag != MPI_ANY_TAG && source != MPI_ANY_SOURCE) {
do {
@@ -521,7 +521,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag,
/* Mask the error bit that might be set on incoming messages. It is
* assumed that the local receive operation won't have the error bit set
* (or it is masked away at some other level). */
- MPIR_TAG_CLEAR_ERROR_BIT(mask.parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(mask.parts.tag);
if (tag != MPI_ANY_TAG && source != MPI_ANY_SOURCE) {
do {
@@ -777,7 +777,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
* have to mask it every time. It will get reset at the end of the loop or
* before the request is added to the unexpected queue if was set here. */
if (MPIR_TAG_CHECK_ERROR_BIT(match->parts.tag)) {
- MPIR_TAG_CLEAR_ERROR_BIT(match->parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(match->parts.tag);
error_bit_masked = 1;
}
@@ -823,14 +823,14 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
MPIDI_CH3I_Comm_find(match->parts.context_id, &comm_ptr);
- if (comm_ptr && comm_ptr->revoked && MPIR_TAG_MASK_ERROR_BIT(match->parts.tag) != MPIR_AGREE_TAG &&
- comm_ptr->revoked && MPIR_TAG_MASK_ERROR_BIT(match->parts.tag) != MPIR_SHRINK_TAG) {
+ if (comm_ptr && comm_ptr->revoked && MPIR_TAG_MASK_ERROR_BITS(match->parts.tag) != MPIR_AGREE_TAG &&
+ comm_ptr->revoked && MPIR_TAG_MASK_ERROR_BITS(match->parts.tag) != MPIR_SHRINK_TAG) {
*foundp = FALSE;
MPIDI_Request_create_null_rreq( rreq, mpi_errno, found=FALSE;goto lock_exit );
MPIU_Assert(mpi_errno == MPI_SUCCESS);
MPIU_DBG_MSG_FMT(CH3_OTHER, VERBOSE,
- (MPIU_DBG_FDEST, "RECEIVED MESSAGE FOR REVOKED COMM (tag=%d,src=%d,cid=%d)\n", MPIR_TAG_MASK_ERROR_BIT(match->parts.tag), match->parts.rank, comm_ptr->context_id));
+ (MPIU_DBG_FDEST, "RECEIVED MESSAGE FOR REVOKED COMM (tag=%d,src=%d,cid=%d)\n", MPIR_TAG_MASK_ERROR_BITS(match->parts.tag), match->parts.rank, comm_ptr->context_id));
return rreq;
}
}
@@ -945,7 +945,7 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
/* Clear the error bit in the tag since we don't care about whether or
* not we're trying to report an error anymore. */
- MPIR_TAG_CLEAR_ERROR_BIT(mask.parts.tag);
+ MPIR_TAG_CLEAR_ERROR_BITS(mask.parts.tag);
while (NULL != rreq) {
/* We'll have to do this matching twice. Once for the pt2pt context id
@@ -963,8 +963,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -979,8 +979,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up unexpected pt2pt pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -993,8 +993,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1007,8 +1007,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up unexpected pt2pt pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1021,8 +1021,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1055,8 +1055,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up posted collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1071,8 +1071,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up posted pt2pt pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1085,8 +1085,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up posted collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1099,8 +1099,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up posted pt2pt pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
@@ -1113,8 +1113,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr)
match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset;
if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) {
- if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
- MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
+ if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG &&
+ MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) {
MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST,
"cleaning up posted collective pkt rank=%d tag=%d contextid=%d",
rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id));
diff --git a/src/mpid/ch3/src/mpid_iprobe.c b/src/mpid/ch3/src/mpid_iprobe.c
index fa32028..9252a57 100644
--- a/src/mpid/ch3/src/mpid_iprobe.c
+++ b/src/mpid/ch3/src/mpid_iprobe.c
@@ -34,8 +34,8 @@ int MPID_Iprobe(int source, int tag, MPID_Comm *comm, int context_offset,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c
index c0401e9..5f22202 100644
--- a/src/mpid/ch3/src/mpid_irecv.c
+++ b/src/mpid/ch3/src/mpid_irecv.c
@@ -33,8 +33,8 @@ int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_DBG_MSG(CH3_OTHER,VERBOSE,"Comm has been revoked. Returning from MPID_IRECV.");
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c
index 0bae646..6bedef9 100644
--- a/src/mpid/ch3/src/mpid_irsend.c
+++ b/src/mpid/ch3/src/mpid_irsend.c
@@ -40,8 +40,8 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c
index 168608d..11f60b8 100644
--- a/src/mpid/ch3/src/mpid_isend.c
+++ b/src/mpid/ch3/src/mpid_isend.c
@@ -52,8 +52,8 @@ int MPID_Isend(const void * buf, int count, MPI_Datatype datatype, int rank,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_DBG_MSG(CH3_OTHER,VERBOSE,"Communicator revoked. MPID_ISEND returning");
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c
index 91e484a..d1def5a 100644
--- a/src/mpid/ch3/src/mpid_issend.c
+++ b/src/mpid/ch3/src/mpid_issend.c
@@ -39,8 +39,8 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_probe.c b/src/mpid/ch3/src/mpid_probe.c
index 9a238e7..e48aae0 100644
--- a/src/mpid/ch3/src/mpid_probe.c
+++ b/src/mpid/ch3/src/mpid_probe.c
@@ -28,8 +28,8 @@ int MPID_Probe(int source, int tag, MPID_Comm * comm, int context_offset,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c
index a042864..40781c8 100644
--- a/src/mpid/ch3/src/mpid_recv.c
+++ b/src/mpid/ch3/src/mpid_recv.c
@@ -41,8 +41,8 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c
index 92990e6..0defcfb 100644
--- a/src/mpid/ch3/src/mpid_rsend.c
+++ b/src/mpid/ch3/src/mpid_rsend.c
@@ -42,8 +42,8 @@ int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c
index b008b68..52dad34 100644
--- a/src/mpid/ch3/src/mpid_send.c
+++ b/src/mpid/ch3/src/mpid_send.c
@@ -40,8 +40,8 @@ int MPID_Send(const void * buf, int count, MPI_Datatype datatype, int rank,
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c
index 07c2087..7ee8883 100644
--- a/src/mpid/ch3/src/mpid_ssend.c
+++ b/src/mpid/ch3/src/mpid_ssend.c
@@ -39,8 +39,8 @@ int MPID_Ssend(const void * buf, int count, MPI_Datatype datatype, int rank, int
/* Check to make sure the communicator hasn't already been revoked */
if (comm->revoked &&
- MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask) &&
- MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BIT(tag & ~MPIR_Process.tagged_coll_mask)) {
+ MPIR_AGREE_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask) &&
+ MPIR_SHRINK_TAG != MPIR_TAG_MASK_ERROR_BITS(tag & ~MPIR_Process.tagged_coll_mask)) {
MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked");
}
-----------------------------------------------------------------------
Summary of changes:
maint/extracterrmsgs | 4 +-
src/include/mpiimpl.h | 207 +++++++++++---------
src/mpi/coll/allgather.c | 74 ++++----
src/mpi/coll/allgatherv.c | 80 ++++----
src/mpi/coll/allred_group.c | 34 ++--
src/mpi/coll/allreduce.c | 76 ++++----
src/mpi/coll/alltoall.c | 54 +++---
src/mpi/coll/alltoallv.c | 42 ++--
src/mpi/coll/alltoallw.c | 38 ++--
src/mpi/coll/barrier.c | 71 ++++----
src/mpi/coll/barrier_group.c | 6 +-
src/mpi/coll/bcast.c | 146 +++++++-------
src/mpi/coll/exscan.c | 12 +-
src/mpi/coll/gather.c | 74 ++++----
src/mpi/coll/gatherv.c | 22 +-
src/mpi/coll/helper_fns.c | 119 ++++++++---
src/mpi/coll/iscatter.c | 8 +-
src/mpi/coll/red_scat.c | 88 ++++----
src/mpi/coll/red_scat_block.c | 84 ++++----
src/mpi/coll/reduce.c | 110 +++++-----
src/mpi/coll/scan.c | 52 +++---
src/mpi/coll/scatter.c | 58 +++---
src/mpi/coll/scatterv.c | 18 +-
src/mpi/comm/comm_agree.c | 2 +-
src/mpi/comm/comm_create.c | 2 +-
src/mpi/comm/comm_shrink.c | 2 +-
src/mpi/comm/comm_split.c | 2 +-
src/mpi/comm/commutil.c | 6 +-
src/mpi/comm/intercomm_create.c | 2 +-
src/mpi/comm/intercomm_merge.c | 4 +-
src/mpi/init/initthread.c | 2 +-
src/mpi/topo/dist_gr_create.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 4 +-
src/mpid/ch3/channels/nemesis/src/ch3i_comm.c | 4 +-
src/mpid/ch3/src/ch3u_comm_spawn_multiple.c | 2 +-
src/mpid/ch3/src/ch3u_port.c | 12 +-
src/mpid/ch3/src/ch3u_recvq.c | 73 ++++----
src/mpid/ch3/src/ch3u_rma_sync.c | 2 +-
src/mpid/ch3/src/ch3u_win_fns.c | 2 +-
src/mpid/ch3/src/mpid_comm_agree.c | 4 +-
src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c | 2 +-
src/mpid/ch3/src/mpid_iprobe.c | 4 +-
src/mpid/ch3/src/mpid_irecv.c | 4 +-
src/mpid/ch3/src/mpid_irsend.c | 4 +-
src/mpid/ch3/src/mpid_isend.c | 4 +-
src/mpid/ch3/src/mpid_issend.c | 4 +-
src/mpid/ch3/src/mpid_probe.c | 4 +-
src/mpid/ch3/src/mpid_recv.c | 6 +-
src/mpid/ch3/src/mpid_rsend.c | 4 +-
src/mpid/ch3/src/mpid_send.c | 5 +-
src/mpid/ch3/src/mpid_ssend.c | 4 +-
src/mpid/ch3/src/mpid_vc.c | 2 +-
src/mpid/ch3/src/mpidi_rma.c | 2 +-
src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c | 2 +-
.../pamid/src/dyntask/mpid_comm_spawn_multiple.c | 2 +-
src/mpid/pamid/src/dyntask/mpidi_pg.c | 2 +-
src/mpid/pamid/src/dyntask/mpidi_port.c | 12 +-
.../pamid/src/onesided/mpid_win_allocate_shared.c | 6 +-
src/mpid/pamid/src/onesided/mpid_win_free.c | 2 +-
test/mpi/ft/testlist | 12 +-
61 files changed, 884 insertions(+), 809 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list