From 284dd6babe508e305db54acf06aeb29342067496 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Mon, 22 Jun 2015 11:01:35 -0600 Subject: [PATCH] pml/ob1: do not use OPAL_ENABLE_MULTI_THREADS to determine thread multiple support OPAL_ENABLE_MULTI_THREADS is always on. The correct value to check is OMPI_ENABLE_THREAD_MULTIPLE. Signed-off-by: Nathan Hjelm --- ompi/mca/pml/ob1/pml_ob1_irecv.c | 8 ++++---- ompi/mca/pml/ob1/pml_ob1_isend.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1_irecv.c b/ompi/mca/pml/ob1/pml_ob1_irecv.c index 5efa0897578..459af46d5e6 100644 --- a/ompi/mca/pml/ob1/pml_ob1_irecv.c +++ b/ompi/mca/pml/ob1/pml_ob1_irecv.c @@ -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); diff --git a/ompi/mca/pml/ob1/pml_ob1_isend.c b/ompi/mca/pml/ob1/pml_ob1_isend.c index 982eb1a2df7..e85ee888473 100644 --- a/ompi/mca/pml/ob1/pml_ob1_isend.c +++ b/ompi/mca/pml/ob1/pml_ob1_isend.c @@ -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;