From 7444b324947411f09ec397c7650211671eed3764 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sun, 29 Sep 2019 18:52:03 -0700 Subject: [PATCH] Remove stale references to orte_oob_base.ev_base The oob is restricted to the main event base Signed-off-by: Ralph Castain --- orte/mca/oob/base/base.h | 3 +-- orte/mca/oob/tcp/oob_tcp_listener.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/orte/mca/oob/base/base.h b/orte/mca/oob/base/base.h index 1046b879f3..9f2a2c4dd2 100644 --- a/orte/mca/oob/base/base.h +++ b/orte/mca/oob/base/base.h @@ -56,7 +56,6 @@ BEGIN_C_DECLS * Convenience Typedef */ typedef struct { - opal_event_base_t *ev_base; char *include; char *exclude; opal_list_t components; @@ -121,7 +120,7 @@ ORTE_DECLSPEC void orte_oob_base_send_nb(int fd, short args, void *cbdata); __FILE__, __LINE__); \ cd = OBJ_NEW(orte_oob_send_t); \ cd->msg = (m); \ - ORTE_THREADSHIFT(cd, orte_oob_base.ev_base, \ + ORTE_THREADSHIFT(cd, orte_event_base, \ orte_oob_base_send_nb, ORTE_MSG_PRI); \ }while(0) diff --git a/orte/mca/oob/tcp/oob_tcp_listener.c b/orte/mca/oob/tcp/oob_tcp_listener.c index 74267c22b2..3635d6a1b7 100644 --- a/orte/mca/oob/tcp/oob_tcp_listener.c +++ b/orte/mca/oob/tcp/oob_tcp_listener.c @@ -157,7 +157,7 @@ int orte_oob_tcp_start_listening(void) /* otherwise, setup to listen via the event lib */ OPAL_LIST_FOREACH(listener, &mca_oob_tcp_component.listeners, mca_oob_tcp_listener_t) { listener->ev_active = true; - opal_event_set(orte_oob_base.ev_base, &listener->event, + opal_event_set(orte_event_base, &listener->event, listener->sd, OPAL_EV_READ|OPAL_EV_PERSIST, connection_event_handler, @@ -744,7 +744,7 @@ static void* listen_thread(opal_object_t *obj) * OS might start rejecting connections due to timeout. */ pending_connection = OBJ_NEW(mca_oob_tcp_pending_connection_t); - opal_event_set(orte_oob_base.ev_base, &pending_connection->ev, -1, + opal_event_set(orte_event_base, &pending_connection->ev, -1, OPAL_EV_WRITE, connection_handler, pending_connection); opal_event_set_priority(&pending_connection->ev, ORTE_MSG_PRI); pending_connection->fd = accept(sd,