From 09f7434491eddfca00c98a19eddedea5ff4dba9e Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 7 Aug 2015 07:46:27 -0700 Subject: [PATCH] ORTE: update for the new opal_progress_thread API --- orte/mca/ess/base/ess_base_std_app.c | 5 +++-- orte/mca/ess/base/ess_base_std_tool.c | 3 ++- orte/mca/notifier/base/notifier_base_frame.c | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/orte/mca/ess/base/ess_base_std_app.c b/orte/mca/ess/base/ess_base_std_app.c index d3bc6e6bbf..26a7d5c69e 100644 --- a/orte/mca/ess/base/ess_base_std_app.c +++ b/orte/mca/ess/base/ess_base_std_app.c @@ -15,6 +15,7 @@ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * 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 * 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; /* open and setup the state machine */ 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 */ if (progress_thread_running) { - opal_stop_progress_thread("opal_async", true); + opal_progress_thread_finalize(NULL); progress_thread_running = false; } diff --git a/orte/mca/ess/base/ess_base_std_tool.c b/orte/mca/ess/base/ess_base_std_tool.c index bc3352c515..198b9d38e2 100644 --- a/orte/mca/ess/base/ess_base_std_tool.c +++ b/orte/mca/ess/base/ess_base_std_tool.c @@ -14,6 +14,7 @@ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved. * + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -276,7 +277,7 @@ int orte_ess_base_tool_finalize(void) /* release the event base */ if (progress_thread_running) { - opal_stop_progress_thread("orte", true); + opal_progress_thread_finalize("orte"); progress_thread_running = false; } return ORTE_SUCCESS; diff --git a/orte/mca/notifier/base/notifier_base_frame.c b/orte/mca/notifier/base/notifier_base_frame.c index 43393fee13..207998c473 100644 --- a/orte/mca/notifier/base/notifier_base_frame.c +++ b/orte/mca/notifier/base/notifier_base_frame.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * 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) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -195,7 +195,7 @@ static int orte_notifier_base_close(void) if (orte_notifier_base.ev_base_active) { 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) { @@ -224,7 +224,7 @@ static int orte_notifier_base_open(mca_base_open_flag_t flags) if (use_progress_thread) { orte_notifier_base.ev_base_active = true; 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; return ORTE_ERROR; }