Merge pull request #3746 from rhc54/topic/grr
Also need to avoid calling destruct on the opal_process_info struct after finalize
Этот коммит содержится в:
Коммит
3aa131a928
@ -39,6 +39,7 @@
|
||||
#include "orte/runtime/orte_locks.h"
|
||||
#include "orte/util/listener.h"
|
||||
#include "orte/util/name_fns.h"
|
||||
#include "orte/util/proc_info.h"
|
||||
#include "orte/util/show_help.h"
|
||||
|
||||
int orte_finalize(void)
|
||||
@ -91,6 +92,9 @@ int orte_finalize(void)
|
||||
opal_argv_free(orte_fork_agent);
|
||||
}
|
||||
|
||||
/* destruct our process info */
|
||||
OBJ_DESTRUCT(&orte_process_info.super);
|
||||
|
||||
/* finalize the opal utilities */
|
||||
rc = opal_finalize();
|
||||
|
||||
|
@ -326,8 +326,6 @@ int orte_proc_info_finalize(void)
|
||||
|
||||
orte_process_info.proc_type = ORTE_PROC_TYPE_NONE;
|
||||
|
||||
OBJ_DESTRUCT(&orte_process_info.super);
|
||||
|
||||
opal_argv_free(orte_process_info.aliases);
|
||||
|
||||
init = false;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user