Skip to content

pml/ob1: do not use OPAL_ENABLE_MULTI_THREADS to determine thread multiple support #651

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
Jun 23, 2015
Merged

pml/ob1: do not use OPAL_ENABLE_MULTI_THREADS to determine thread multiple support #651

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions ompi/mca/pml/ob1/pml_ob1_irecv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ int mca_pml_ob1_recv(void *addr,
mca_pml_ob1_recv_request_t *recvreq = NULL;
int rc;

#if !OPAL_ENABLE_MULTI_THREADS
#if !OMPI_ENABLE_THREAD_MULTIPLE
recvreq = mca_pml_ob1_recvreq;
if( OPAL_UNLIKELY(NULL == recvreq) )
#endif /* !OPAL_ENABLE_MULTI_THREADS */
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
{
MCA_PML_OB1_RECV_REQUEST_ALLOC(recvreq);
if (NULL == recvreq)
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
#if !OPAL_ENABLE_MULTI_THREADS
#if !OMPI_ENABLE_THREAD_MULTIPLE
mca_pml_ob1_recvreq = recvreq;
#endif /* !OPAL_ENABLE_MULTI_THREADS */
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
}
OBJ_CONSTRUCT(recvreq, mca_pml_ob1_recv_request_t);

Expand Down
8 changes: 4 additions & 4 deletions ompi/mca/pml/ob1/pml_ob1_isend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,17 @@ int mca_pml_ob1_send(void *buf,
}
}

#if !OPAL_ENABLE_MULTI_THREADS
#if !OMPI_ENABLE_THREAD_MULTIPLE
sendreq = mca_pml_ob1_sendreq;
if( OPAL_UNLIKELY(NULL == sendreq) )
#endif /* !OPAL_ENABLE_MULTI_THREADS */
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
{
MCA_PML_OB1_SEND_REQUEST_ALLOC(comm, dst, sendreq);
if (NULL == sendreq)
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
#if !OPAL_ENABLE_MULTI_THREADS
#if !OMPI_ENABLE_THREAD_MULTIPLE
mca_pml_ob1_sendreq = sendreq;
#endif /* !OPAL_ENABLE_MULTI_THREADS */
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
}
OBJ_CONSTRUCT(sendreq, mca_pml_ob1_send_request_t);
sendreq->req_send.req_base.req_proc = dst_proc;
Expand Down