Merge pull request #7284 from bosilca/fix/monitoring_registration

Minor cleanup in the monitoring PML.

ompi/mca/common/monitoring/common_monitoring.c

@@ -255,7 +255,7 @@ void mca_common_monitoring_finalize( void )
     }
 }
 
-void mca_common_monitoring_register(void*pml_monitoring_component)
+int mca_common_monitoring_register(void)
 {
     /* Because we are playing tricks with the component close, we should not
      * use mca_base_component_var_register but instead stay with the basic
@@ -284,7 +284,6 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
                                 &mca_common_monitoring_output_enabled);
 
     (void)mca_base_var_register("ompi", "pml", "monitoring", "filename",
-                                /*&mca_common_monitoring_component.pmlm_version, "filename",*/
                                 "The name of the file where the monitoring information "
                                 "should be saved (the filename will be extended with the "
                                 "process rank and the \".prof\" extension). If this field "
@@ -301,10 +300,9 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
      * filename to be handled by the framework. It's easier to deal
      * with the string lifetime.
      */
-    if( NULL != mca_common_monitoring_initial_filename )
+    if( NULL != mca_common_monitoring_initial_filename ) {
         mca_common_monitoring_current_filename = strdup(mca_common_monitoring_initial_filename);
-
-    /* Register PVARs */
+    }
 
     /* PML PVARs */
     (void)mca_base_pvar_register("ompi", "pml", "monitoring", "flush", "Flush the monitoring "
@@ -429,6 +427,8 @@ void mca_common_monitoring_register(void*pml_monitoring_component)
                                  MCA_BASE_PVAR_FLAG_READONLY | MCA_BASE_PVAR_FLAG_IWG,
                                  mca_common_monitoring_coll_get_a2a_size, NULL,
                                  mca_common_monitoring_coll_messages_notify, NULL);
+
+    return OMPI_SUCCESS;
 }
 
 /**

ompi/mca/common/monitoring/common_monitoring.h

@@ -45,10 +45,10 @@ extern int mca_common_monitoring_enabled;
 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 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);
+OMPI_DECLSPEC int mca_common_monitoring_register(void);
 
 /* Records PML communication */
 OMPI_DECLSPEC void mca_common_monitoring_record_pml(int world_rank, size_t data_size, int tag);

ompi/mca/pml/monitoring/pml_monitoring_component.c

@@ -182,12 +182,6 @@ static int mca_pml_monitoring_component_finish(void)
     return OMPI_SUCCESS;
 }
 
-static int mca_pml_monitoring_component_register(void)
-{
-    mca_common_monitoring_register(&mca_pml_monitoring_component);
-    return OMPI_SUCCESS;
-}
-
 mca_pml_base_component_2_0_0_t mca_pml_monitoring_component = {
 
     /* First, the mca_base_component_t struct containing meta
@@ -200,7 +194,7 @@ mca_pml_base_component_2_0_0_t mca_pml_monitoring_component = {
         MCA_MONITORING_MAKE_VERSION,
         .mca_open_component = mca_pml_monitoring_component_open,  /* component open */
         .mca_close_component = NULL, /* component close */
-        .mca_register_component_params = mca_pml_monitoring_component_register
+        .mca_register_component_params = mca_common_monitoring_register
     },
     .pmlm_data = {
         /* The component is checkpoint ready */