Skip to content

Commit 861016c

Browse files
Ralph Castainrhc54
authored andcommitted
Cleanup race condition in finalize
See #5798 (comment) for a lengthy explanation Signed-off-by: Ralph Castain <[email protected]> (cherry picked from commit 57f6b94)
1 parent 9a1b6cf commit 861016c

File tree

8 files changed

+368
-473
lines changed

8 files changed

+368
-473
lines changed

orte/mca/ess/base/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
13-
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
13+
# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
1414
# $COPYRIGHT$
1515
#
1616
# Additional copyrights may follow
@@ -28,7 +28,6 @@ libmca_ess_la_SOURCES += \
2828
base/ess_base_select.c \
2929
base/ess_base_get.c \
3030
base/ess_base_std_tool.c \
31-
base/ess_base_std_app.c \
3231
base/ess_base_std_orted.c \
3332
base/ess_base_std_prolog.c \
3433
base/ess_base_fns.c

orte/mca/ess/base/base.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ ORTE_DECLSPEC int orte_ess_env_get(void);
6161

6262
ORTE_DECLSPEC int orte_ess_base_std_prolog(void);
6363

64-
ORTE_DECLSPEC int orte_ess_base_app_setup(bool db_restrict_local);
65-
ORTE_DECLSPEC int orte_ess_base_app_finalize(void);
66-
ORTE_DECLSPEC void orte_ess_base_app_abort(int status, bool report);
67-
6864
ORTE_DECLSPEC int orte_ess_base_tool_setup(opal_list_t *flags);
6965
ORTE_DECLSPEC int orte_ess_base_tool_finalize(void);
7066

0 commit comments

Comments
 (0)