- With the change from MCA_PML_OB1_FREE in r8945 to the send/recv
counterparts, the reset to MPI_REQUEST_NULL of the upper struct ompi_request_t was broken. Nightly mpi_test_suite failed, e.g. mpirun -np 2 ./mpi_test_suite -t "Ring Isend" This commit was SVN r9028. The following SVN revision numbers were found above: r8945 --> open-mpi/ompi@83f83e5730
Этот коммит содержится в:
родитель
23cb499df9
Коммит
45e3415bb5
@ -40,11 +40,13 @@ static int mca_pml_ob1_recv_request_fini(struct ompi_request_t** request)
|
||||
if(recvreq->req_recv.req_base.req_persistent) {
|
||||
if(recvreq->req_recv.req_base.req_free_called) {
|
||||
MCA_PML_OB1_RECV_REQUEST_FREE(recvreq);
|
||||
*request = MPI_REQUEST_NULL;
|
||||
} else {
|
||||
recvreq->req_recv.req_base.req_ompi.req_state = OMPI_REQUEST_INACTIVE;
|
||||
}
|
||||
} else {
|
||||
MCA_PML_OB1_RECV_REQUEST_FREE(recvreq);
|
||||
*request = MPI_REQUEST_NULL;
|
||||
}
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
@ -52,6 +54,7 @@ static int mca_pml_ob1_recv_request_fini(struct ompi_request_t** request)
|
||||
static int mca_pml_ob1_recv_request_free(struct ompi_request_t** request)
|
||||
{
|
||||
MCA_PML_OB1_RECV_REQUEST_FREE( *(mca_pml_ob1_recv_request_t**)request );
|
||||
*request = MPI_REQUEST_NULL;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -131,7 +131,6 @@ do {
|
||||
if( pml_request->req_pml_complete == true) { \
|
||||
MCA_PML_OB1_RECV_REQUEST_RETURN((recvreq)); \
|
||||
} \
|
||||
(recvreq) = (mca_pml_ob1_recv_request_t*)MPI_REQUEST_NULL; \
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -41,6 +41,7 @@ static int mca_pml_ob1_send_request_fini(struct ompi_request_t** request)
|
||||
if(sendreq->req_send.req_base.req_persistent) {
|
||||
if(sendreq->req_send.req_base.req_free_called) {
|
||||
MCA_PML_OB1_SEND_REQUEST_FREE(sendreq);
|
||||
*request = MPI_REQUEST_NULL;
|
||||
} else {
|
||||
sendreq->req_send.req_base.req_ompi.req_state = OMPI_REQUEST_INACTIVE;
|
||||
/* rewind convertor */
|
||||
@ -56,6 +57,7 @@ static int mca_pml_ob1_send_request_fini(struct ompi_request_t** request)
|
||||
}
|
||||
} else {
|
||||
MCA_PML_OB1_SEND_REQUEST_FREE(sendreq);
|
||||
*request = MPI_REQUEST_NULL;
|
||||
}
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
@ -63,6 +65,7 @@ static int mca_pml_ob1_send_request_fini(struct ompi_request_t** request)
|
||||
static int mca_pml_ob1_send_request_free(struct ompi_request_t** request)
|
||||
{
|
||||
MCA_PML_OB1_SEND_REQUEST_FREE( *(mca_pml_ob1_send_request_t**)request );
|
||||
*request = MPI_REQUEST_NULL;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -323,7 +323,6 @@ do {
|
||||
} \
|
||||
MCA_PML_OB1_SEND_REQUEST_RETURN(sendreq); \
|
||||
} \
|
||||
(sendreq) = (mca_pml_ob1_send_request_t*)MPI_REQUEST_NULL; \
|
||||
}
|
||||
|
||||
/*
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user