Skip to content

Commit 42717fb

Browse files
committed
ORTE: update for the new opal_progress_thread API
(cherry picked from commit open-mpi/ompi@09f7434)
1 parent bbe570a commit 42717fb

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

orte/mca/ess/base/ess_base_std_app.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
1616
* Copyright (c) 2014 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
18+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1819
* $COPYRIGHT$
1920
*
2021
* Additional copyrights may follow
@@ -109,7 +110,7 @@ int orte_ess_base_app_setup(bool db_restrict_local)
109110

110111
/* get an async event base - we use the opal_async one so
111112
* we don't startup extra threads if not needed */
112-
orte_event_base = opal_start_progress_thread("opal_async", true);
113+
orte_event_base = opal_progress_thread_init(NULL);
113114
progress_thread_running = true;
114115

115116
/* open and setup the state machine */
@@ -262,7 +263,7 @@ int orte_ess_base_app_finalize(void)
262263

263264
/* release the event base */
264265
if (progress_thread_running) {
265-
opal_stop_progress_thread("opal_async", true);
266+
opal_progress_thread_finalize(NULL);
266267
progress_thread_running = false;
267268
}
268269

orte/mca/ess/base/ess_base_std_tool.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
1515
* Copyright (c) 2014 Hochschule Esslingen. All rights reserved.
1616
*
17+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -243,7 +244,7 @@ int orte_ess_base_tool_finalize(void)
243244

244245
/* release the event base */
245246
if (progress_thread_running) {
246-
opal_stop_progress_thread("orte", true);
247+
opal_progress_thread_finalize("orte");
247248
progress_thread_running = false;
248249
}
249250
return ORTE_SUCCESS;

orte/mca/notifier/base/notifier_base_frame.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12-
* Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
12+
* Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2014 Intel, Inc. All rights reserved.
1414
* Copyright (c) 2015 Research Organization for Information Science
1515
* and Technology (RIST). All rights reserved.
@@ -195,7 +195,7 @@ static int orte_notifier_base_close(void)
195195

196196
if (orte_notifier_base.ev_base_active) {
197197
orte_notifier_base.ev_base_active = false;
198-
opal_stop_progress_thread("notifier", true);
198+
opal_progress_thread_finalize("notifier");
199199
}
200200

201201
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)
224224
if (use_progress_thread) {
225225
orte_notifier_base.ev_base_active = true;
226226
if (NULL == (orte_notifier_base.ev_base =
227-
opal_start_progress_thread("notifier", true))) {
227+
opal_progress_thread_init("notifier"))) {
228228
orte_notifier_base.ev_base_active = false;
229229
return ORTE_ERROR;
230230
}

0 commit comments

Comments
 (0)