* Rename opal_hwloc_components to opal_hwloc_base_components

* Fix some comments

This commit was SVN r25150.

ompi/tools/ompi_info/components.c

@@ -349,7 +349,7 @@ void ompi_info_open_components(void)
     }
     map = OBJ_NEW(ompi_info_component_map_t);
     map->type = strdup("hwloc");
-    map->components = &opal_hwloc_components;
+    map->components = &opal_hwloc_base_components;
     opal_pointer_array_add(&component_map, map);
 #endif
 

opal/mca/hwloc/base/base.h

@@ -60,7 +60,7 @@ OPAL_DECLSPEC int opal_hwloc_base_close(void);
  * Debugging output stream
  */
 OPAL_DECLSPEC extern int opal_hwloc_base_output;
-OPAL_DECLSPEC extern opal_list_t opal_hwloc_components;
+OPAL_DECLSPEC extern opal_list_t opal_hwloc_base_components;
 OPAL_DECLSPEC extern bool opal_hwloc_base_inited;
 OPAL_DECLSPEC extern bool opal_hwloc_topology_inited;
 

opal/mca/hwloc/base/hwloc_base_close.c

@@ -28,12 +28,12 @@ int opal_hwloc_base_close(void)
         /* no need to close the component as it was statically opened */
 
         /* for support of tools such as ompi_info */
-        for (item = opal_list_remove_first(&opal_hwloc_components);
+        for (item = opal_list_remove_first(&opal_hwloc_base_components);
              NULL != item; 
-             item = opal_list_remove_first(&opal_hwloc_components)) {
+             item = opal_list_remove_first(&opal_hwloc_base_components)) {
             OBJ_RELEASE(item);
         }
-        OBJ_DESTRUCT(&opal_hwloc_components);
+        OBJ_DESTRUCT(&opal_hwloc_base_components);
     }
 #endif
 

opal/mca/hwloc/base/hwloc_base_open.c

@@ -33,7 +33,7 @@
  * Globals
  */
 int opal_hwloc_base_output = -1;
-opal_list_t opal_hwloc_components;
+opal_list_t opal_hwloc_base_components;
 bool opal_hwloc_base_inited = false;
 #if OPAL_HAVE_HWLOC
 hwloc_topology_t opal_hwloc_topology=NULL;
@@ -65,11 +65,11 @@ int opal_hwloc_base_open(void)
         /* to support tools such as ompi_info, add the components
          * to a list
          */
-        OBJ_CONSTRUCT(&opal_hwloc_components, opal_list_t);
+        OBJ_CONSTRUCT(&opal_hwloc_base_components, opal_list_t);
         if (OPAL_SUCCESS !=
             mca_base_components_open("hwloc", opal_hwloc_base_output,
                                      mca_hwloc_base_static_components,
-                                     &opal_hwloc_components, true)) {
+                                     &opal_hwloc_base_components, true)) {
             return OPAL_ERROR;
         }
 

opal/mca/maffinity/hwloc/configure.m4

@@ -9,8 +9,8 @@
 # $HEADER$
 #
 
-# MCA_maffinity_hwloc_CONFIG([action-if-found], [action-if-not-found])
-# --------------------------------------------------------------------
+# MCA_opal_maffinity_hwloc_CONFIG([action-if-found], [action-if-not-found])
+# -------------------------------------------------------------------------
 AC_DEFUN([MCA_opal_maffinity_hwloc_CONFIG],[
     AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
     AC_CONFIG_FILES([opal/mca/maffinity/hwloc/Makefile])

opal/mca/paffinity/hwloc/configure.m4

@@ -19,8 +19,8 @@
 # $HEADER$
 #
 
-# MCA_paffinity_hwloc_CONFIG([action-if-found], [action-if-not-found])
-# --------------------------------------------------------------------
+# MCA_opal_paffinity_hwloc_CONFIG([action-if-found], [action-if-not-found])
+# -------------------------------------------------------------------------
 AC_DEFUN([MCA_opal_paffinity_hwloc_CONFIG],[
     AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
     AC_CONFIG_FILES([opal/mca/paffinity/hwloc/Makefile])

orte/tools/orte-info/components.c

@@ -299,7 +299,7 @@ void orte_info_open_components(void)
     }
     map = OBJ_NEW(orte_info_component_map_t);
     map->type = strdup("hwloc");
-    map->components = &opal_hwloc_components;
+    map->components = &opal_hwloc_base_components;
     opal_pointer_array_add(&component_map, map);
 #endif