Commit f5927f07 authored by William Gropp's avatar William Gropp
Browse files

[svn-r9919] Added missing code coverage annotations

parent c4df8e66
......@@ -794,10 +794,12 @@ int MPIR_Allgather_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype,
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Allgather != NULL)
{
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Allgather(sendbuf, sendcount, sendtype,
recvbuf, recvcount, recvtype,
comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Allgather(sendbuf, sendcount, sendtype,
recvbuf, recvcount, recvtype,
......
......@@ -913,9 +913,11 @@ int MPIR_Allgatherv_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype,
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Allgatherv != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Allgatherv(sendbuf, sendcount, sendtype,
recvbuf, recvcounts, displs, recvtype, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Allgatherv(sendbuf, sendcount, sendtype,
recvbuf, recvcounts, displs, recvtype, comm_ptr, errflag);
......
......@@ -99,8 +99,10 @@ static inline int allreduce_intra_or_coll_fn(void *sendbuf, void *recvbuf, int c
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Allreduce != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Allreduce(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Allreduce_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
......@@ -702,8 +704,10 @@ int MPIR_Allreduce_impl(void *sendbuf, void *recvbuf, int count, MPI_Datatype da
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Allreduce != NULL)
{
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Allreduce(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
}
else
{
......
......@@ -698,10 +698,12 @@ int MPIR_Alltoall_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Alltoall != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Alltoall(sendbuf, sendcount, sendtype,
recvbuf, recvcount, recvtype,
comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Alltoall(sendbuf, sendcount, sendtype,
recvbuf, recvcount, recvtype,
......
......@@ -378,10 +378,12 @@ int MPIR_Alltoallv_impl(void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Alltoallv != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Alltoallv(sendbuf, sendcnts, sdispls,
sendtype, recvbuf, recvcnts,
rdispls, recvtype, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Alltoallv(sendbuf, sendcnts, sdispls,
sendtype, recvbuf, recvcnts,
......
......@@ -373,10 +373,12 @@ int MPIR_Alltoallw_impl(void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Alltoallw != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Alltoallw(sendbuf, sendcnts, sdispls,
sendtypes, recvbuf, recvcnts,
rdispls, recvtypes, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Alltoallw(sendbuf, sendcnts, sdispls,
sendtypes, recvbuf, recvcnts,
......
......@@ -262,8 +262,10 @@ int MPIR_Barrier_impl(MPID_Comm *comm_ptr, int *errflag)
int mpi_errno_ret = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Barrier != NULL)
{
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Barrier(comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
}
else
{
......
......@@ -82,7 +82,9 @@ static int MPIR_Bcast_binomial(
if (is_homogeneous)
MPID_Datatype_get_size_macro(datatype, type_size);
else
/* --BEGIN HETEROGENEOUS-- */
MPIR_Pack_size_impl(1, datatype, &type_size);
/* --END HETEROGENEOUS-- */
nbytes = type_size * count;
if (nbytes == 0)
......@@ -211,10 +213,12 @@ static int MPIR_Bcast_binomial(
fn_exit:
MPIU_CHKLMEM_FREEALL();
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -347,10 +351,12 @@ static int scatter_for_bcast(
}
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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -434,7 +440,9 @@ static int MPIR_Bcast_scatter_doubling_allgather(
if (is_homogeneous)
MPID_Datatype_get_size_macro(datatype, type_size);
else
/* --BEGIN HETEROGENEOUS-- */
MPIR_Pack_size_impl(1, datatype, &type_size);
/* --END HETEROGENEOUS-- */
nbytes = type_size * count;
if (nbytes == 0)
......@@ -511,11 +519,13 @@ static int MPIR_Bcast_scatter_doubling_allgather(
(nbytes-recv_offset < 0 ? 0 : nbytes-recv_offset),
MPI_BYTE, dst, MPIR_BCAST_TAG, comm, &status, errflag);
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");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_size = 0;
/* --END ERROR HANDLING-- */
} else
MPIR_Get_count_impl(&status, MPI_BYTE, &recv_size);
curr_size += recv_size;
......@@ -607,11 +617,13 @@ static int MPIR_Bcast_scatter_doubling_allgather(
/* nprocs_completed is also equal to the no. of processes
whose data we don't have */
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");
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
recv_size = 0;
/* --END ERROR HANDLING-- */
} else
MPIR_Get_count_impl(&status, MPI_BYTE, &recv_size);
curr_size += recv_size;
......@@ -651,10 +663,12 @@ static int MPIR_Bcast_scatter_doubling_allgather(
fn_exit:
MPIU_CHKLMEM_FREEALL();
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -734,7 +748,9 @@ static int MPIR_Bcast_scatter_ring_allgather(
if (is_homogeneous)
MPID_Datatype_get_size_macro(datatype, type_size);
else
/* --BEGIN HETEROGENEOUS-- */
MPIR_Pack_size_impl(1, datatype, &type_size);
/* --END HETEROGENEOUS-- */
nbytes = type_size * count;
if (nbytes == 0)
......@@ -838,10 +854,12 @@ static int MPIR_Bcast_scatter_ring_allgather(
fn_exit:
MPIU_CHKLMEM_FREEALL();
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -920,7 +938,9 @@ static int MPIR_SMP_Bcast(
if (is_homogeneous)
MPID_Datatype_get_size_macro(datatype, type_size);
else
/* --BEGIN HETEROGENEOUS-- */
MPIR_Pack_size_impl(1, datatype, &type_size);
/* --END HETEROGENEOUS-- */
nbytes = type_size * count;
if (nbytes == 0)
......@@ -1050,10 +1070,12 @@ static int MPIR_SMP_Bcast(
}
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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -1160,7 +1182,9 @@ int MPIR_Bcast_intra (
if (is_homogeneous)
MPID_Datatype_get_size_macro(datatype, type_size);
else
/* --BEGIN HETEROGENEOUS-- */
MPIR_Pack_size_impl(1, datatype, &type_size);
/* --END HETEROGENEOUS-- */
nbytes = type_size * count;
if (nbytes == 0)
......@@ -1209,10 +1233,12 @@ fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_BCAST);
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -1304,10 +1330,12 @@ int MPIR_Bcast_inter (
fn_fail:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_BCAST_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");
/* --END ERROR HANDLING-- */
return mpi_errno;
}
......
......@@ -241,8 +241,10 @@ int MPIR_Exscan_impl(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Exscan != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Exscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Exscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
......
......@@ -682,10 +682,12 @@ int MPIR_Gather_impl(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Gather != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Gather(sendbuf, sendcnt,
sendtype, recvbuf, recvcnt,
recvtype, root, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Gather(sendbuf, sendcnt, sendtype,
recvbuf, recvcnt, recvtype, root,
......
......@@ -199,10 +199,12 @@ int MPIR_Gatherv_impl(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Gatherv != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Gatherv(sendbuf, sendcnt, sendtype,
recvbuf, recvcnts, displs, recvtype,
root, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Gatherv(sendbuf, sendcnt, sendtype,
recvbuf, recvcnts, displs, recvtype,
......
......@@ -1056,10 +1056,13 @@ int MPIR_Reduce_scatter_impl(void *sendbuf, void *recvbuf, int *recvcnts,
{
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Reduce_scatter != NULL) {
if (comm_ptr->coll_fns != NULL &&
comm_ptr->coll_fns->Reduce_scatter != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Reduce_scatter(sendbuf, recvbuf, recvcnts,
datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Reduce_scatter(sendbuf, recvbuf, recvcnts,
datatype, op, comm_ptr, errflag);
......
......@@ -166,10 +166,12 @@ static int MPIR_Reduce_scatter_block_noncomm (
fn_exit:
MPIU_CHKLMEM_FREEALL();
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -844,10 +846,12 @@ fn_exit:
if (MPIU_THREADPRIV_FIELD(op_errno))
mpi_errno = MPIU_THREADPRIV_FIELD(op_errno);
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -965,10 +969,12 @@ int MPIR_Reduce_scatter_block_inter (
fn_exit:
MPIU_CHKLMEM_FREEALL();
/* --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");
/* --END ERROR HANDLING-- */
return mpi_errno;
fn_fail:
goto fn_exit;
......@@ -1019,8 +1025,10 @@ int MPIR_Reduce_scatter_block_impl(void *sendbuf, void *recvbuf, int recvcount,
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Reduce_scatter_block != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
/* intracommunicator */
......
......@@ -1016,9 +1016,11 @@ int MPIR_Reduce_impl(void *sendbuf, void *recvbuf, int count, MPI_Datatype datat
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Reduce != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Reduce(sendbuf, recvbuf, count,
datatype, op, root, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
/* intracommunicator */
......
......@@ -430,9 +430,11 @@ int MPIR_Scan_impl(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Scan != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Scan(sendbuf, recvbuf, count,
datatype, op, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Scan(sendbuf, recvbuf, count, datatype,
op, comm_ptr, errflag);
......
......@@ -609,9 +609,11 @@ int MPIR_Scatter_impl(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Scatter != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Scatter(sendbuf, sendcnt, sendtype,
recvbuf, recvcnt, recvtype, root, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Scatter(sendbuf, sendcnt, sendtype,
recvbuf, recvcnt, recvtype, root, comm_ptr, errflag);
......
......@@ -176,10 +176,12 @@ int MPIR_Scatterv_impl(void *sendbuf, int *sendcnts, int *displs, MPI_Datatype s
int mpi_errno = MPI_SUCCESS;
if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Scatter != NULL) {
/* --BEGIN USEREXTENSION-- */
mpi_errno = comm_ptr->coll_fns->Scatterv(sendbuf, sendcnts, displs,
sendtype, recvbuf, recvcnt,
recvtype, root, comm_ptr, errflag);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* --END USEREXTENSION-- */
} else {
mpi_errno = MPIR_Scatterv(sendbuf, sendcnts, displs, sendtype,
recvbuf, recvcnt, recvtype,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment