Merge pull request #6072 from kawashima-fj/pr/timing

kawashima-fj · web-flow · commit 592e2cc0d930 · 2018-11-13T10:07:45.000+09:00
ess/pmi: Fix `--enable-timing` compilation error
diff --git a/orte/mca/ess/pmi/ess_pmi_module.c b/orte/mca/ess/pmi/ess_pmi_module.c
@@ -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
@@ -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) {
@@ -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) {
@@ -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())) {
diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c
@@ -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) {
@@ -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) {
@@ -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) {
@@ -463,7 +458,6 @@ static int rte_init(void)
             goto error;
         }
     }
-    OPAL_TIMING_ENV_NEXT(rte_init, "rte_init_done");
 
     return ORTE_SUCCESS;
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* and Technology (RIST). All rights reserved.`
`18`	`18`	`* Copyright (c) 2018 Mellanox Technologies, Inc.`
`19`	`19`	`* All rights reserved.`
	`20`	`+ * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.`
`20`	`21`	`* $COPYRIGHT$`
`21`	`22`	`*`
`22`	`23`	`* Additional copyrights may follow`
`@@ -464,15 +465,15 @@ static int rte_init(void)`
`464`	`465`	`error = "orte_state_base_select";`
`465`	`466`	`goto error;`
`466`	`467`	`}`
`467`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "state_framework_open");`
	`468`	`+ OPAL_TIMING_ENV_NEXT(rte_init, "state_framework_open");`
`468`	`469`
`469`	`470`	`/* open the errmgr */`
`470`	`471`	`if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_errmgr_base_framework, 0))) {`
`471`	`472`	`ORTE_ERROR_LOG(ret);`
`472`	`473`	`error = "orte_errmgr_base_open";`
`473`	`474`	`goto error;`
`474`	`475`	`}`
`475`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_framework_open");`
	`476`	`+ OPAL_TIMING_ENV_NEXT(rte_init, "errmgr_framework_open");`
`476`	`477`
`477`	`478`	`/* setup my session directory */`
`478`	`479`	`if (orte_create_session_dirs) {`
`@@ -508,7 +509,7 @@ static int rte_init(void)`
`508`	`509`	`}`
`509`	`510`	`}`
`510`	`511`	`}`
`511`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "create_session_dirs");`
	`512`	`+ OPAL_TIMING_ENV_NEXT(rte_init, "create_session_dirs");`
`512`	`513`
`513`	`514`	`/* if we have info on the HNP and local daemon, process it */`
`514`	`515`	`if (NULL != orte_process_info.my_hnp_uri) {`
`@@ -560,7 +561,7 @@ static int rte_init(void)`
`560`	`561`	`error = "orte_errmgr_base_select";`
`561`	`562`	`goto error;`
`562`	`563`	`}`
`563`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_select");`
	`564`	`+ OPAL_TIMING_ENV_NEXT(rte_init, "errmgr_select");`
`564`	`565`
`565`	`566`	`/* setup process binding */`
`566`	`567`	`if (ORTE_SUCCESS != (ret = orte_ess_base_proc_binding())) {`
Original file line number	Diff line number	Diff line change
`@@ -321,15 +321,13 @@ static int rte_init(void)`
`321`	`321`	`error = "orte_state_base_select";`
`322`	`322`	`goto error;`
`323`	`323`	`}`
`324`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "state_framework_open");`
`325`	`324`
`326`	`325`	`/* open the errmgr */`
`327`	`326`	`if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_errmgr_base_framework, 0))) {`
`328`	`327`	`ORTE_ERROR_LOG(ret);`
`329`	`328`	`error = "orte_errmgr_base_open";`
`330`	`329`	`goto error;`
`331`	`330`	`}`
`332`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_framework_open");`
`333`	`331`
`334`	`332`	`/* setup my session directory */`
`335`	`333`	`if (orte_create_session_dirs) {`
`@@ -365,7 +363,6 @@ static int rte_init(void)`
`365`	`363`	`}`
`366`	`364`	`}`
`367`	`365`	`}`
`368`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "create_session_dirs");`
`369`	`366`
`370`	`367`	`/* if we have info on the HNP and local daemon, process it */`
`371`	`368`	`if (NULL != orte_process_info.my_hnp_uri) {`
`@@ -417,14 +414,12 @@ static int rte_init(void)`
`417`	`414`	`error = "orte_errmgr_base_select";`
`418`	`415`	`goto error;`
`419`	`416`	`}`
`420`		`- OPAL_TIMING_ENV_NEXT(ess_base_setup, "errmgr_select");`
`421`	`417`
`422`	`418`	`/* setup process binding */`
`423`	`419`	`if (ORTE_SUCCESS != (ret = orte_ess_base_proc_binding())) {`
`424`	`420`	`error = "proc_binding";`
`425`	`421`	`goto error;`
`426`	`422`	`}`
`427`		`- OPAL_TIMING_ENV_NEXT(rte_init, "ess_base_proc_binding");`
`428`	`423`
`429`	`424`	`/* this needs to be set to enable debugger use when direct launched */`
`430`	`425`	`if (NULL == orte_process_info.my_daemon_uri) {`
`@@ -463,7 +458,6 @@ static int rte_init(void)`
`463`	`458`	`goto error;`
`464`	`459`	`}`
`465`	`460`	`}`
`466`		`- OPAL_TIMING_ENV_NEXT(rte_init, "rte_init_done");`
`467`	`461`
`468`	`462`	`return ORTE_SUCCESS;`
`469`	`463`