Skip to content

Commit 7444b32

Browse files
committed
Remove stale references to orte_oob_base.ev_base
The oob is restricted to the main event base Signed-off-by: Ralph Castain <[email protected]>
1 parent 5e9d07d commit 7444b32

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

orte/mca/oob/base/base.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ BEGIN_C_DECLS
5656
* Convenience Typedef
5757
*/
5858
typedef struct {
59-
opal_event_base_t *ev_base;
6059
char *include;
6160
char *exclude;
6261
opal_list_t components;
@@ -121,7 +120,7 @@ ORTE_DECLSPEC void orte_oob_base_send_nb(int fd, short args, void *cbdata);
121120
__FILE__, __LINE__); \
122121
cd = OBJ_NEW(orte_oob_send_t); \
123122
cd->msg = (m); \
124-
ORTE_THREADSHIFT(cd, orte_oob_base.ev_base, \
123+
ORTE_THREADSHIFT(cd, orte_event_base, \
125124
orte_oob_base_send_nb, ORTE_MSG_PRI); \
126125
}while(0)
127126

orte/mca/oob/tcp/oob_tcp_listener.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ int orte_oob_tcp_start_listening(void)
157157
/* otherwise, setup to listen via the event lib */
158158
OPAL_LIST_FOREACH(listener, &mca_oob_tcp_component.listeners, mca_oob_tcp_listener_t) {
159159
listener->ev_active = true;
160-
opal_event_set(orte_oob_base.ev_base, &listener->event,
160+
opal_event_set(orte_event_base, &listener->event,
161161
listener->sd,
162162
OPAL_EV_READ|OPAL_EV_PERSIST,
163163
connection_event_handler,
@@ -744,7 +744,7 @@ static void* listen_thread(opal_object_t *obj)
744744
* OS might start rejecting connections due to timeout.
745745
*/
746746
pending_connection = OBJ_NEW(mca_oob_tcp_pending_connection_t);
747-
opal_event_set(orte_oob_base.ev_base, &pending_connection->ev, -1,
747+
opal_event_set(orte_event_base, &pending_connection->ev, -1,
748748
OPAL_EV_WRITE, connection_handler, pending_connection);
749749
opal_event_set_priority(&pending_connection->ev, ORTE_MSG_PRI);
750750
pending_connection->fd = accept(sd,

0 commit comments

Comments
 (0)