Skip to content

Commit 9f28c0a

Browse files
committed
verbs: remove extra event user increment/decrement operation
Since the oob and connections systems do not work the same way they did in older versions of Open MPI these operations are no longer necessary. At best they do nothing and at worst they hurt performance by making us enter the event library more often in opal_progress(). Fixes #2839 Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 164fc64 commit 9f28c0a

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

opal/mca/btl/openib/btl_openib_endpoint.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2006-2013 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2006-2007 Voltaire All rights reserved.
1717
* Copyright (c) 2006-2009 Mellanox Technologies, Inc. All rights reserved.
@@ -642,10 +642,6 @@ void mca_btl_openib_endpoint_connected(mca_btl_openib_endpoint_t *endpoint)
642642
endpoint->endpoint_state = MCA_BTL_IB_CONNECTED;
643643
endpoint->endpoint_btl->device->non_eager_rdma_endpoints++;
644644

645-
/* The connection is correctly setup. Now we can decrease the
646-
event trigger. */
647-
opal_progress_event_users_decrement();
648-
649645
if(MCA_BTL_XRC_ENABLED) {
650646
if (master) {
651647
while (NULL != (ep_item = opal_list_remove_first(&endpoint->ib_addr->pending_ep))) {

opal/mca/btl/openib/btl_openib_endpoint.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights
14+
* Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2006-2007 Voltaire All rights reserved.
1717
* Copyright (c) 2007-2009 Mellanox Technologies. All rights reserved.
@@ -501,13 +501,6 @@ static inline int check_endpoint_state(mca_btl_openib_endpoint_t *ep,
501501
if (OPAL_SUCCESS == rc) {
502502
rc = OPAL_ERR_RESOURCE_BUSY;
503503
}
504-
/*
505-
* As long as we expect a message from the peer (in order
506-
* to setup the connection) let the event engine pool the
507-
* OOB events. Note: we increment it once peer active
508-
* connection.
509-
*/
510-
opal_progress_event_users_increment();
511504
/* fall through */
512505
default:
513506
opal_list_append(pending_list, (opal_list_item_t *)des);

orte/mca/oob/ud/oob_ud_event.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2011-2012 Los Alamos National Security, LLC. All rights
3+
* Copyright (c) 2011-2017 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* 2014 Mellanox Technologies, Inc.
66
* All rights reserved.
@@ -53,9 +53,6 @@ static bool event_completed_set = false;
5353
void mca_oob_ud_event_start_monitor (mca_oob_ud_device_t *device)
5454
{
5555
if (!event_started) {
56-
#if !OPAL_ENABLE_PROGRESS_THREADS
57-
opal_progress_event_users_increment ();
58-
#endif
5956
opal_event_set (orte_event_base, &device->event, device->ib_channel->fd,
6057
OPAL_EV_READ, mca_oob_ud_event_dispatch, (void *) device);
6158
opal_event_add (&device->event, NULL);
@@ -66,9 +63,6 @@ void mca_oob_ud_event_start_monitor (mca_oob_ud_device_t *device)
6663
void mca_oob_ud_event_stop_monitor (mca_oob_ud_device_t *device)
6764
{
6865
if (event_started) {
69-
#if !OPAL_ENABLE_PROGRESS_THREADS
70-
opal_progress_event_users_decrement ();
71-
#endif
7266
opal_event_del (&device->event);
7367
mca_oob_ud_stop_events (device);
7468
event_started = false;

0 commit comments

Comments
 (0)