Skip to content

V3.1.x coll/hcoll: Fix return codes #4851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2018
Merged

V3.1.x coll/hcoll: Fix return codes #4851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ompi/mca/coll/hcoll/coll_hcoll_rte.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static int recv_nb(struct dte_data_representation_t data,
if (NULL == ec_h.handle && -1 != ec_h.rank) {
fprintf(stderr,"***Error in hcolrte_rml_recv_nb: wrong null argument: "
"ec_h.handle = %p, ec_h.rank = %d\n",ec_h.handle,ec_h.rank);
return 1;
return HCOLL_ERROR;
}
assert(HCOL_DTE_IS_INLINE(data));
/*do inline nb recv*/
Expand All @@ -195,7 +195,7 @@ static int recv_nb(struct dte_data_representation_t data,
if (!buffer && !HCOL_DTE_IS_ZERO(data)) {
fprintf(stderr, "***Error in hcolrte_rml_recv_nb: buffer pointer is NULL"
" for non DTE_ZERO INLINE data representation\n");
return 1;
return HCOLL_ERROR;
}
size = (size_t)data.rep.in_line_rep.data_handle.in_line.packed_size*count/8;

Expand All @@ -204,7 +204,7 @@ static int recv_nb(struct dte_data_representation_t data,
if (MCA_PML_CALL(irecv(buffer,size,&(ompi_mpi_unsigned_char.dt),ec_h.rank,
tag,comm,&ompi_req)))
{
return 1;
return HCOLL_ERROR;
}
req->data = (void *)ompi_req;
req->status = HCOLRTE_REQUEST_ACTIVE;
Expand All @@ -226,7 +226,7 @@ static int send_nb( dte_data_representation_t data,
if (! ec_h.handle) {
fprintf(stderr,"***Error in hcolrte_rml_send_nb: wrong null argument: "
"ec_h.handle = %p, ec_h.rank = %d\n",ec_h.handle,ec_h.rank);
return 1;
return HCOLL_ERROR;
}
assert(HCOL_DTE_IS_INLINE(data));
/*do inline nb recv*/
Expand All @@ -235,15 +235,15 @@ static int send_nb( dte_data_representation_t data,
if (!buffer && !HCOL_DTE_IS_ZERO(data)) {
fprintf(stderr, "***Error in hcolrte_rml_send_nb: buffer pointer is NULL"
" for non DTE_ZERO INLINE data representation\n");
return 1;
return HCOLL_ERROR;
}
size = (size_t)data.rep.in_line_rep.data_handle.in_line.packed_size*count/8;
HCOL_VERBOSE(30,"PML_ISEND: dest = %d: buf = %p: size = %u: comm = %p",
ec_h.rank, buffer, (unsigned int)size, (void *)comm);
if (MCA_PML_CALL(isend(buffer,size,&(ompi_mpi_unsigned_char.dt),ec_h.rank,
tag,MCA_PML_BASE_SEND_STANDARD,comm,&ompi_req)))
{
return 1;
return HCOLL_ERROR;
}
req->data = (void *)ompi_req;
req->status = HCOLRTE_REQUEST_ACTIVE;
Expand Down