Skip to content

v4.0.x: ess/pmi: Fix --enable-timing compilation error #6996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2019
Merged

v4.0.x: ess/pmi: Fix --enable-timing compilation error #6996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions orte/mca/ess/pmi/ess_pmi_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -464,15 +465,15 @@ static int rte_init(void)
error = "orte_state_base_select";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "state_framework_open");
OPAL_TIMING_ENV_NEXT(rte_init, "state_framework_open");

/* open the errmgr */
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_errmgr_base_framework, 0))) {
ORTE_ERROR_LOG(ret);
error = "orte_errmgr_base_open";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_framework_open");
OPAL_TIMING_ENV_NEXT(rte_init, "errmgr_framework_open");

/* setup my session directory */
if (orte_create_session_dirs) {
Expand Down Expand Up @@ -508,7 +509,7 @@ static int rte_init(void)
}
}
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "create_session_dirs");
OPAL_TIMING_ENV_NEXT(rte_init, "create_session_dirs");

/* if we have info on the HNP and local daemon, process it */
if (NULL != orte_process_info.my_hnp_uri) {
Expand Down Expand Up @@ -560,7 +561,7 @@ static int rte_init(void)
error = "orte_errmgr_base_select";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_select");
OPAL_TIMING_ENV_NEXT(rte_init, "errmgr_select");

/* setup process binding */
if (ORTE_SUCCESS != (ret = orte_ess_base_proc_binding())) {
Expand Down
6 changes: 0 additions & 6 deletions orte/mca/ess/singleton/ess_singleton_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,13 @@ static int rte_init(void)
error = "orte_state_base_select";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "state_framework_open");

/* open the errmgr */
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_errmgr_base_framework, 0))) {
ORTE_ERROR_LOG(ret);
error = "orte_errmgr_base_open";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_framework_open");

/* setup my session directory */
if (orte_create_session_dirs) {
Expand Down Expand Up @@ -365,7 +363,6 @@ static int rte_init(void)
}
}
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "create_session_dirs");

/* if we have info on the HNP and local daemon, process it */
if (NULL != orte_process_info.my_hnp_uri) {
Expand Down Expand Up @@ -417,14 +414,12 @@ static int rte_init(void)
error = "orte_errmgr_base_select";
goto error;
}
OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_select");

/* setup process binding */
if (ORTE_SUCCESS != (ret = orte_ess_base_proc_binding())) {
error = "proc_binding";
goto error;
}
OPAL_TIMING_ENV_NEXT(rte_init, "ess_base_proc_binding");

/* this needs to be set to enable debugger use when direct launched */
if (NULL == orte_process_info.my_daemon_uri) {
Expand Down Expand Up @@ -463,7 +458,6 @@ static int rte_init(void)
goto error;
}
}
OPAL_TIMING_ENV_NEXT(rte_init, "rte_init_done");

return ORTE_SUCCESS;

Expand Down