Protect the monitoring infrastructure initialization.

bosilca · bosilca · commit f8ffec926ee9 · 2017-06-27T18:35:24.000+02:00
diff --git a/ompi/mca/coll/monitoring/coll_monitoring_component.c b/ompi/mca/coll/monitoring/coll_monitoring_component.c
@@ -106,8 +106,7 @@ static int mca_coll_monitoring_component_init(bool enable_progress_threads,
                                               bool enable_mpi_threads)
 {
     OPAL_MONITORING_PRINT_INFO("coll_module_init");
-    mca_common_monitoring_init();
-    return OMPI_SUCCESS;
+    return mca_common_monitoring_init();
 }
 
 static int mca_coll_monitoring_component_register(void)
diff --git a/ompi/mca/common/monitoring/common_monitoring.c b/ompi/mca/common/monitoring/common_monitoring.c
@@ -203,10 +203,10 @@ static int mca_common_monitoring_comm_size_notify(mca_base_pvar_t *pvar,
     return OMPI_ERROR;
 }
 
-void mca_common_monitoring_init( void )
+int mca_common_monitoring_init( void )
 {
-    if( mca_common_monitoring_enabled &&
-        1 < opal_atomic_add_32(&mca_common_monitoring_hold, 1) ) return; /* Already initialized */
+    if( !mca_common_monitoring_enabled ) return OMPI_ERROR;
+    if( 1 < opal_atomic_add_32(&mca_common_monitoring_hold, 1) ) return OMPI_SUCCESS; /* Already initialized */
 
     char hostname[OPAL_MAXHOSTNAMELEN] = "NA";
     /* Initialize constant */
@@ -220,6 +220,7 @@ void mca_common_monitoring_init( void )
     /* Initialize proc translation hashtable */
     common_monitoring_translation_ht = OBJ_NEW(opal_hash_table_t);
     opal_hash_table_init(common_monitoring_translation_ht, 2048);
+    return OMPI_SUCCESS;
 }
 
 void mca_common_monitoring_finalize( void )
diff --git a/ompi/mca/common/monitoring/common_monitoring.h b/ompi/mca/common/monitoring/common_monitoring.h
@@ -46,7 +46,7 @@ extern int mca_common_monitoring_current_state;
 extern opal_hash_table_t *common_monitoring_translation_ht;
 
 OMPI_DECLSPEC void mca_common_monitoring_register(void*pml_monitoring_component);
-OMPI_DECLSPEC void mca_common_monitoring_init( void );
+OMPI_DECLSPEC int mca_common_monitoring_init( void );
 OMPI_DECLSPEC void mca_common_monitoring_finalize( void );
 OMPI_DECLSPEC int mca_common_monitoring_add_procs(struct ompi_proc_t **procs, size_t nprocs);
 
diff --git a/ompi/mca/osc/monitoring/osc_monitoring_component.c b/ompi/mca/osc/monitoring/osc_monitoring_component.c
@@ -46,8 +46,7 @@ static int mca_osc_monitoring_component_init(bool enable_progress_threads,
                                              bool enable_mpi_threads)
 {
     OPAL_MONITORING_PRINT_INFO("osc_component_init");
-    mca_common_monitoring_init();
-    return OMPI_SUCCESS;
+    return mca_common_monitoring_init();
 }
 
 static int mca_osc_monitoring_component_finish(void)
diff --git a/ompi/mca/pml/monitoring/pml_monitoring_component.c b/ompi/mca/pml/monitoring/pml_monitoring_component.c
@@ -144,8 +144,8 @@ mca_pml_monitoring_component_init(int* priority,
                                   bool enable_progress_threads,
                                   bool enable_mpi_threads)
 {
-    mca_common_monitoring_init();
-    if( mca_common_monitoring_enabled ) {
+    if( (OMPI_SUCCESS == mca_common_monitoring_init()) &&
+        mca_common_monitoring_enabled ) {
         *priority = 0;  /* I'm up but don't select me */
         return &mca_pml_monitoring_module;
     }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ static int mca_coll_monitoring_component_init(bool enable_progress_threads,`
`106`	`106`	`bool enable_mpi_threads)`
`107`	`107`	`{`
`108`	`108`	`OPAL_MONITORING_PRINT_INFO("coll_module_init");`
`109`		`- mca_common_monitoring_init();`
`110`		`- return OMPI_SUCCESS;`
	`109`	`+ return mca_common_monitoring_init();`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`static int mca_coll_monitoring_component_register(void)`
Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,10 @@ static int mca_common_monitoring_comm_size_notify(mca_base_pvar_t *pvar,`
`203`	`203`	`return OMPI_ERROR;`
`204`	`204`	`}`
`205`	`205`
`206`		`-void mca_common_monitoring_init( void )`
	`206`	`+int mca_common_monitoring_init( void )`
`207`	`207`	`{`
`208`		`- if( mca_common_monitoring_enabled &&`
`209`		`- 1 < opal_atomic_add_32(&mca_common_monitoring_hold, 1) ) return; /* Already initialized */`
	`208`	`+ if( !mca_common_monitoring_enabled ) return OMPI_ERROR;`
	`209`	`+ if( 1 < opal_atomic_add_32(&mca_common_monitoring_hold, 1) ) return OMPI_SUCCESS; /* Already initialized */`
`210`	`210`
`211`	`211`	`char hostname[OPAL_MAXHOSTNAMELEN] = "NA";`
`212`	`212`	`/* Initialize constant */`
`@@ -220,6 +220,7 @@ void mca_common_monitoring_init( void )`
`220`	`220`	`/* Initialize proc translation hashtable */`
`221`	`221`	`common_monitoring_translation_ht = OBJ_NEW(opal_hash_table_t);`
`222`	`222`	`opal_hash_table_init(common_monitoring_translation_ht, 2048);`
	`223`	`+ return OMPI_SUCCESS;`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`void mca_common_monitoring_finalize( void )`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ static int mca_osc_monitoring_component_init(bool enable_progress_threads,`
`46`	`46`	`bool enable_mpi_threads)`
`47`	`47`	`{`
`48`	`48`	`OPAL_MONITORING_PRINT_INFO("osc_component_init");`
`49`		`- mca_common_monitoring_init();`
`50`		`- return OMPI_SUCCESS;`
	`49`	`+ return mca_common_monitoring_init();`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`static int mca_osc_monitoring_component_finish(void)`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ mca_pml_monitoring_component_init(int* priority,`
`144`	`144`	`bool enable_progress_threads,`
`145`	`145`	`bool enable_mpi_threads)`
`146`	`146`	`{`
`147`		`- mca_common_monitoring_init();`
`148`		`- if( mca_common_monitoring_enabled ) {`
	`147`	`+ if( (OMPI_SUCCESS == mca_common_monitoring_init()) &&`
	`148`	`+ mca_common_monitoring_enabled ) {`
`149`	`149`	`priority = 0; / I'm up but don't select me */`
`150`	`150`	`return &mca_pml_monitoring_module;`
`151`	`151`	`}`