From dbcc53bc6f1beefa98d6f80e5a53a163a1696803 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Tue, 7 Jan 2014 19:41:39 +0000 Subject: [PATCH] Fix a threading issue Remove some unneeded UNLIKELYs This commit was SVN r30138. --- ompi/mca/mtl/portals4/mtl_portals4_cancel.c | 2 +- ompi/mca/mtl/portals4/mtl_portals4_recv.c | 2 +- ompi/mca/mtl/portals4/mtl_portals4_send.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ompi/mca/mtl/portals4/mtl_portals4_cancel.c b/ompi/mca/mtl/portals4/mtl_portals4_cancel.c index 8fad7159b3..70a5110793 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_cancel.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_cancel.c @@ -47,7 +47,7 @@ ompi_mtl_portals4_cancel(struct mca_mtl_base_module_t* mtl, if (PTL_INVALID_HANDLE != recvreq->me_h) { ret = PtlMEUnlink(recvreq->me_h); - if (OPAL_UNLIKELY(PTL_OK == ret)) { + if (PTL_OK == ret) { recvreq->super.super.ompi_req->req_status._cancelled = true; recvreq->super.super.completion_callback(&recvreq->super.super); } diff --git a/ompi/mca/mtl/portals4/mtl_portals4_recv.c b/ompi/mca/mtl/portals4/mtl_portals4_recv.c index 2dda6819a5..f6f15d3bfb 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_recv.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_recv.c @@ -360,7 +360,7 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl, ptl_request->super.type = portals4_req_recv; ptl_request->super.event_callback = ompi_mtl_portals4_recv_progress; #if OPAL_ENABLE_DEBUG - ptl_request->opcount = ++ompi_mtl_portals4.recv_opcount; + ptl_request->opcount = OPAL_THREAD_ADD64((int64_t*) &ompi_mtl_portals4.recv_opcount, 1); ptl_request->hdr_data = 0; #endif ptl_request->buffer_ptr = (free_after) ? start : NULL; diff --git a/ompi/mca/mtl/portals4/mtl_portals4_send.c b/ompi/mca/mtl/portals4/mtl_portals4_send.c index ed19f4aa99..122cc58804 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_send.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_send.c @@ -438,7 +438,7 @@ ompi_mtl_portals4_send_start(struct mca_mtl_base_module_t* mtl, pending->proc = proc; pending->ptl_request = ptl_request; - if (OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, -1) < 0) { + if (OPAL_UNLIKELY(OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, -1) < 0)) { OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, 1); opal_list_append(&ompi_mtl_portals4.flowctl.pending_sends, &pending->super.super);