ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Avoid a double lock interlock when calling pmix_finalize

Просмотр исходного кода 
Signed-off-by: Aurelien Bouteiller <bouteill@icl.utk.edu>
Этот коммит содержится в:
Aurelien Bouteiller 2018-10-25 15:22:48 -04:00
родитель 1a97555478
Коммит 50cf707f3f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 08F60797C5941DB2
6 изменённых файлов: 84 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
opal/mca/pmix/ext2x/ext2x_client.c
Просмотреть файл

@ -8,6 +8,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -166,6 +169,8 @@ int ext2x_client_finalize(void)
{
pmix_status_t rc;
opal_ext2x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"PMIx_client finalize");
@ -179,12 +184,19 @@ int ext2x_client_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_ext2x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_ext2x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_Finalize(NULL, 0);
return ext2x_convert_rc(rc);

17
opal/mca/pmix/ext2x/ext2x_server_south.c
Просмотреть файл

@ -9,6 +9,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -181,6 +184,8 @@ int ext2x_server_finalize(void)
{
pmix_status_t rc;
opal_ext2x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
--opal_pmix_base.initialized;
@ -191,13 +196,19 @@ int ext2x_server_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_ext2x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_ext2x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_server_finalize();
return ext2x_convert_rc(rc);
}

16
opal/mca/pmix/ext3x/ext3x_client.c
Просмотреть файл

@ -8,6 +8,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -170,6 +173,8 @@ int ext3x_client_finalize(void)
{
pmix_status_t rc;
opal_ext3x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"PMIx_client finalize");
@ -183,12 +188,19 @@ int ext3x_client_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_ext3x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_ext3x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_Finalize(NULL, 0);
return ext3x_convert_rc(rc);

16
opal/mca/pmix/ext3x/ext3x_server_south.c
Просмотреть файл

@ -9,6 +9,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -187,6 +190,8 @@ int ext3x_server_finalize(void)
{
pmix_status_t rc;
opal_ext3x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
--opal_pmix_base.initialized;
@ -197,12 +202,19 @@ int ext3x_server_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_ext3x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_ext3x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_server_finalize();
return ext3x_convert_rc(rc);
}

16
opal/mca/pmix/pmix4x/pmix4x_client.c
Просмотреть файл

@ -8,6 +8,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2017-2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -169,6 +172,8 @@ int pmix4x_client_finalize(void)
{
pmix_status_t rc;
opal_pmix4x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"PMIx_client finalize");
@ -182,12 +187,19 @@ int pmix4x_client_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_pmix4x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_pmix4x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_Finalize(NULL, 0);
return pmix4x_convert_rc(rc);

16
opal/mca/pmix/pmix4x/pmix4x_server_south.c
Просмотреть файл

@ -9,6 +9,9 @@
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2017-2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -186,6 +189,8 @@ int pmix4x_server_finalize(void)
{
pmix_status_t rc;
opal_pmix4x_event_t *event, *ev2;
opal_list_t evlist;
OBJ_CONSTRUCT(&evlist, opal_list_t);
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
--opal_pmix_base.initialized;
@ -196,12 +201,19 @@ int pmix4x_server_finalize(void)
OPAL_PMIX_DESTRUCT_LOCK(&event->lock);
OPAL_PMIX_CONSTRUCT_LOCK(&event->lock);
PMIx_Deregister_event_handler(event->index, dereg_cbfunc, (void*)event);
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&mca_pmix_pmix4x_component.events, &event->super);
OBJ_RELEASE(event);
/* wait and release outside the loop to avoid double mutex
* interlock */
opal_list_append(&evlist, &event->super);
}
}
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
OPAL_LIST_FOREACH_SAFE(event, ev2, &evlist, opal_pmix4x_event_t) {
OPAL_PMIX_WAIT_THREAD(&event->lock);
opal_list_remove_item(&evlist, &event->super);
OBJ_RELEASE(event);
}
OBJ_DESTRUCT(&evlist);
rc = PMIx_server_finalize();
return pmix4x_convert_rc(rc);
}