1
1

Remove stale references to orte_oob_base.ev_base

The oob is restricted to the main event base

Signed-off-by: Ralph Castain <rhc@pmix.org>
Этот коммит содержится в:
Ralph Castain 2019-09-29 18:52:03 -07:00
родитель 5e9d07d4e0
Коммит 7444b32494
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B63B630167D26BB5
2 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -56,7 +56,6 @@ BEGIN_C_DECLS
* Convenience Typedef * Convenience Typedef
*/ */
typedef struct { typedef struct {
opal_event_base_t *ev_base;
char *include; char *include;
char *exclude; char *exclude;
opal_list_t components; opal_list_t components;
@ -121,7 +120,7 @@ ORTE_DECLSPEC void orte_oob_base_send_nb(int fd, short args, void *cbdata);
__FILE__, __LINE__); \ __FILE__, __LINE__); \
cd = OBJ_NEW(orte_oob_send_t); \ cd = OBJ_NEW(orte_oob_send_t); \
cd->msg = (m); \ 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); \ orte_oob_base_send_nb, ORTE_MSG_PRI); \
}while(0) }while(0)

Просмотреть файл

@ -157,7 +157,7 @@ int orte_oob_tcp_start_listening(void)
/* otherwise, setup to listen via the event lib */ /* otherwise, setup to listen via the event lib */
OPAL_LIST_FOREACH(listener, &mca_oob_tcp_component.listeners, mca_oob_tcp_listener_t) { OPAL_LIST_FOREACH(listener, &mca_oob_tcp_component.listeners, mca_oob_tcp_listener_t) {
listener->ev_active = true; listener->ev_active = true;
opal_event_set(orte_oob_base.ev_base, &listener->event, opal_event_set(orte_event_base, &listener->event,
listener->sd, listener->sd,
OPAL_EV_READ|OPAL_EV_PERSIST, OPAL_EV_READ|OPAL_EV_PERSIST,
connection_event_handler, connection_event_handler,
@ -744,7 +744,7 @@ static void* listen_thread(opal_object_t *obj)
* OS might start rejecting connections due to timeout. * OS might start rejecting connections due to timeout.
*/ */
pending_connection = OBJ_NEW(mca_oob_tcp_pending_connection_t); 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_EV_WRITE, connection_handler, pending_connection);
opal_event_set_priority(&pending_connection->ev, ORTE_MSG_PRI); opal_event_set_priority(&pending_connection->ev, ORTE_MSG_PRI);
pending_connection->fd = accept(sd, pending_connection->fd = accept(sd,