1
1

ORTE: update for the new opal_progress_thread API

Этот коммит содержится в:
Jeff Squyres 2015-08-07 07:46:27 -07:00
родитель d7c25f683e
Коммит 09f7434491
3 изменённых файлов: 8 добавлений и 6 удалений

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

@ -15,6 +15,7 @@
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science * Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -116,7 +117,7 @@ int orte_ess_base_app_setup(bool db_restrict_local)
/* get an async event base - we use the opal_async one so /* get an async event base - we use the opal_async one so
* we don't startup extra threads if not needed */ * we don't startup extra threads if not needed */
orte_event_base = opal_start_progress_thread("opal_async", true); orte_event_base = opal_progress_thread_init(NULL);
progress_thread_running = true; progress_thread_running = true;
/* open and setup the state machine */ /* open and setup the state machine */
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_state_base_framework, 0))) { if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_state_base_framework, 0))) {
@ -361,7 +362,7 @@ int orte_ess_base_app_finalize(void)
/* release the event base */ /* release the event base */
if (progress_thread_running) { if (progress_thread_running) {
opal_stop_progress_thread("opal_async", true); opal_progress_thread_finalize(NULL);
progress_thread_running = false; progress_thread_running = false;
} }

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

@ -14,6 +14,7 @@
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Hochschule Esslingen. All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved.
* *
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -276,7 +277,7 @@ int orte_ess_base_tool_finalize(void)
/* release the event base */ /* release the event base */
if (progress_thread_running) { if (progress_thread_running) {
opal_stop_progress_thread("orte", true); opal_progress_thread_finalize("orte");
progress_thread_running = false; progress_thread_running = false;
} }
return ORTE_SUCCESS; return ORTE_SUCCESS;

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

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -195,7 +195,7 @@ static int orte_notifier_base_close(void)
if (orte_notifier_base.ev_base_active) { if (orte_notifier_base.ev_base_active) {
orte_notifier_base.ev_base_active = false; orte_notifier_base.ev_base_active = false;
opal_stop_progress_thread("notifier", true); opal_progress_thread_finalize("notifier");
} }
OPAL_LIST_FOREACH(i_module, &orte_notifier_base.modules, orte_notifier_active_module_t) { OPAL_LIST_FOREACH(i_module, &orte_notifier_base.modules, orte_notifier_active_module_t) {
@ -224,7 +224,7 @@ static int orte_notifier_base_open(mca_base_open_flag_t flags)
if (use_progress_thread) { if (use_progress_thread) {
orte_notifier_base.ev_base_active = true; orte_notifier_base.ev_base_active = true;
if (NULL == (orte_notifier_base.ev_base = if (NULL == (orte_notifier_base.ev_base =
opal_start_progress_thread("notifier", true))) { opal_progress_thread_init("notifier"))) {
orte_notifier_base.ev_base_active = false; orte_notifier_base.ev_base_active = false;
return ORTE_ERROR; return ORTE_ERROR;
} }