Don't destroy the event channel until after everything else has been
torn down. Fixes trac:1582. This commit was SVN r19800. The following Trac tickets were found above: Ticket 1582 --> https://svn.open-mpi.org/trac/ompi/ticket/1582
Этот коммит содержится в:
родитель
ae34fd150a
Коммит
b5123cb79f
@ -922,10 +922,6 @@ static void *rdmacm_unmonitor(int fd, int flags, void *context)
|
|||||||
{
|
{
|
||||||
volatile int *barrier = (volatile int *) context;
|
volatile int *barrier = (volatile int *) context;
|
||||||
|
|
||||||
if (NULL != event_channel) {
|
|
||||||
rdma_destroy_event_channel(event_channel);
|
|
||||||
event_channel = NULL;
|
|
||||||
}
|
|
||||||
OPAL_OUTPUT((-1, "SERVICE rdmacm unlocking main thread"));
|
OPAL_OUTPUT((-1, "SERVICE rdmacm unlocking main thread"));
|
||||||
*barrier = 1;
|
*barrier = 1;
|
||||||
|
|
||||||
@ -1885,6 +1881,12 @@ static int rdmacm_component_finalize(void)
|
|||||||
}
|
}
|
||||||
OBJ_DESTRUCT(&server_listener_list);
|
OBJ_DESTRUCT(&server_listener_list);
|
||||||
|
|
||||||
|
/* Now we're all done -- destroy the event channel */
|
||||||
|
if (NULL != event_channel) {
|
||||||
|
rdma_destroy_event_channel(event_channel);
|
||||||
|
event_channel = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
mca_btl_openib_free_rdma_addr_list();
|
mca_btl_openib_free_rdma_addr_list();
|
||||||
|
|
||||||
return OMPI_SUCCESS;
|
return OMPI_SUCCESS;
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user