Only keep a generated argv-style array

Following Jeff's advice, the configure.m4 file generate a simple array
of module variables to be iterated over to find the proper module.

Signed-off-by: Clement Foyer <[email protected]>

Author: clementFoyer

ompi/mca/osc/monitoring/configure.m4

@@ -48,8 +48,8 @@ AC_DEFUN(
 #include <ompi/mca/osc/osc.h>
 #include <ompi/mca/osc/monitoring/osc_monitoring_template.h>
 
-/***************************************/
-/* Include template generating macros  */
+/************************************************************/
+/* Include template generating macros and inlined functions */
 
 EOF
                # Generate each case in order to register the proper template functions
@@ -59,37 +59,36 @@ EOF
                done
                cat <<EOF >>$filename
 
-/***************************************/
+/************************************************************/
 
-static inline int
-ompi_mca_osc_monitoring_set_template(ompi_osc_base_component_t *best_component,
-                                     ompi_osc_base_module_t *module)
-{
-    /* Sorry for the lack on indentation, but the portability won over the cleanliness */   
+typedef struct {
+    const char * name;
+    ompi_osc_base_module_t * (*fct) (ompi_osc_base_module_t *);
+} osc_monitoring_components_list_t;
+
+static const osc_monitoring_components_list_t osc_monitoring_components_list[[]] = {
 EOF
                for comp in $components
                do
-                   echo "if ( 0 == strcmp(\"${comp}\", best_component->osc_version.mca_component_name) ) {" >>$filename
-                   echo "        OSC_MONITORING_SET_TEMPLATE_FCT_NAME(${comp}) (module);" >>$filename
-                   echo "    } else " >>$filename
+                   echo "    { .name = \"${comp}\", .fct = OSC_MONITORING_SET_TEMPLATE_FCT_NAME(${comp}) }," >>$filename
                done
                cat <<EOF >>$filename
-        return OMPI_ERR_NOT_SUPPORTED;
-    return OMPI_SUCCESS;
-}
+    { .name = NULL, .fct = NULL }
+};
 
 #endif /* MCA_OSC_MONITORING_GEN_TEMPLATE_H */
 EOF
-               unset filename components])
+               unset filename components
+              ])
          ])dnl
-])dnl
+    ])dnl
 
 # MCA_ompi_osc_monitoring_CONFIG()
 # ------------------------------------------------
 AC_DEFUN(
     [MCA_ompi_osc_monitoring_CONFIG],
     [AC_CONFIG_FILES([ompi/mca/osc/monitoring/Makefile])
-     
+
      AS_IF([test "$MCA_BUILD_ompi_common_monitoring_DSO_TRUE" = ''],
            [$1],
            [$2])

ompi/mca/osc/monitoring/osc_monitoring_component.c

@@ -52,6 +52,20 @@ static int mca_osc_monitoring_component_query(struct ompi_win_t *win, void **bas
     return mca_osc_monitoring_component.priority;
 }
 
+static inline int
+ompi_mca_osc_monitoring_set_template(ompi_osc_base_component_t *best_component,
+                                     ompi_osc_base_module_t *module)
+{
+    osc_monitoring_components_list_t comp = osc_monitoring_components_list[0];
+    for (unsigned i = 0; NULL != comp.name; comp = osc_monitoring_components_list[++i]) {
+        if ( 0 == strcmp(comp.name, best_component->osc_version.mca_component_name) ) {
+            comp.fct(module);
+            return OMPI_SUCCESS;
+        }
+    }
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
 static int mca_osc_monitoring_component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
                                                struct ompi_communicator_t *comm, struct opal_info_t *info,
                                                int flavor, int *model)