Skip to content

Commit 2b62a2b

Browse files
authored
Merge pull request #8023 from abouteiller/bugfix/ob1_err_abort
errors_are_fatal_comm_handler takes a pointer to the error constant
2 parents c1c71b2 + 4df5fcf commit 2b62a2b

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

ompi/mca/pml/ob1/pml_ob1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ void mca_pml_ob1_error_handler(
829829
/* TODO: this error should return to the caller and invoke an error
830830
* handler from the MPI API call.
831831
* For now, it is fatal. */
832-
ompi_mpi_errors_are_fatal_comm_handler(NULL, -1, btlinfo);
832+
ompi_mpi_errors_are_fatal_comm_handler(NULL, NULL, btlinfo);
833833
}
834834

835835
#if OPAL_ENABLE_FT_CR == 0

ompi/mca/pml/ob1/pml_ob1_recvreq.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ recv_request_pml_complete(mca_pml_ob1_recv_request_t *recvreq)
181181
if( MPI_SUCCESS != recvreq->req_recv.req_base.req_ompi.req_status.MPI_ERROR ) {
182182
/* An error after freeing the request MUST be fatal
183183
* MPI3 ch3.7: MPI_REQUEST_FREE */
184-
ompi_mpi_errors_are_fatal_comm_handler(NULL, MPI_ERR_REQUEST, "Recv error after request freed");
184+
int err = MPI_ERR_REQUEST;
185+
ompi_mpi_errors_are_fatal_comm_handler(NULL, &err, "Recv error after request freed");
185186
}
186187
MCA_PML_OB1_RECV_REQUEST_RETURN(recvreq);
187188
} else {

ompi/mca/pml/ob1/pml_ob1_sendreq.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ send_request_pml_complete(mca_pml_ob1_send_request_t *sendreq)
278278
if( MPI_SUCCESS != sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR ) {
279279
/* An error after freeing the request MUST be fatal
280280
* MPI3 ch3.7: MPI_REQUEST_FREE */
281-
ompi_mpi_errors_are_fatal_comm_handler(NULL, MPI_ERR_REQUEST, "Send error after request freed");
281+
int err = MPI_ERR_REQUEST;
282+
ompi_mpi_errors_are_fatal_comm_handler(NULL, &err, "Send error after request freed");
282283
}
283284
}
284285
} else {

0 commit comments

Comments
 (0)