From 24c3b4f849651e2a37c4d3813f56565ea94f1109 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Mon, 29 Mar 2010 20:47:29 +0000
Subject: [PATCH] Add the sysinfo framework to the "info" tools, especially
 since the odls_base_open function calls it!

This commit was SVN r22901.
---
 ompi/tools/ompi_info/components.c | 11 +++++++++++
 ompi/tools/ompi_info/ompi_info.c  |  1 +
 orte/tools/orte-info/components.c | 13 ++++++++++++-
 orte/tools/orte-info/orte-info.c  |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ompi/tools/ompi_info/components.c b/ompi/tools/ompi_info/components.c
index 04bd4eb34a..0404b6e4d1 100644
--- a/ompi/tools/ompi_info/components.c
+++ b/ompi/tools/ompi_info/components.c
@@ -46,6 +46,8 @@
 #include "opal/mca/timer/base/base.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/mca/installdirs/base/base.h"
+#include "opal/mca/sysinfo/sysinfo.h"
+#include "opal/mca/sysinfo/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
@@ -300,6 +302,14 @@ void ompi_info_open_components(void)
     map->components = &opal_maffinity_base_components_opened;
     opal_pointer_array_add(&component_map, map);
     
+    if (OPAL_SUCCESS != opal_sysinfo_base_open()) {
+        goto error;
+    }
+    map = OBJ_NEW(orte_info_component_map_t);
+    map->type = strdup("sysinfo");
+    map->components = &opal_sysinfo_base_components_opened;
+    opal_pointer_array_add(&component_map, map);
+    
     if (OPAL_SUCCESS != opal_timer_base_open()) {
         goto error;
     }
@@ -678,6 +688,7 @@ void ompi_info_close_components()
         (void) opal_carto_base_close();
         (void) opal_maffinity_base_close();
         (void) opal_timer_base_close();
+        (void) opal_sysinfo_base_close();
 #if OPAL_ENABLE_FT_CR == 1
         (void) opal_crs_base_close();
 #endif
diff --git a/ompi/tools/ompi_info/ompi_info.c b/ompi/tools/ompi_info/ompi_info.c
index 362d6a7a3a..c9ce0a9759 100644
--- a/ompi/tools/ompi_info/ompi_info.c
+++ b/ompi/tools/ompi_info/ompi_info.c
@@ -194,6 +194,7 @@ int main(int argc, char *argv[])
     opal_pointer_array_add(&mca_types, "maffinity");
     opal_pointer_array_add(&mca_types, "timer");
     opal_pointer_array_add(&mca_types, "installdirs");
+    opal_pointer_array_add(&mca_types, "sysinfo");
 #if OPAL_ENABLE_FT_CR == 1
     opal_pointer_array_add(&mca_types, "crs");
 #endif
diff --git a/orte/tools/orte-info/components.c b/orte/tools/orte-info/components.c
index 63a8082e73..96ad4db058 100644
--- a/orte/tools/orte-info/components.c
+++ b/orte/tools/orte-info/components.c
@@ -45,6 +45,8 @@
 #include "opal/mca/timer/base/base.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/mca/installdirs/base/base.h"
+#include "opal/mca/sysinfo/sysinfo.h"
+#include "opal/mca/sysinfo/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
@@ -267,6 +269,14 @@ void orte_info_open_components(void)
     map->components = &opal_maffinity_base_components_opened;
     opal_pointer_array_add(&component_map, map);
     
+    if (OPAL_SUCCESS != opal_sysinfo_base_open()) {
+        goto error;
+    }
+    map = OBJ_NEW(orte_info_component_map_t);
+    map->type = strdup("sysinfo");
+    map->components = &opal_sysinfo_base_components_opened;
+    opal_pointer_array_add(&component_map, map);
+    
     if (OPAL_SUCCESS != opal_timer_base_open()) {
         goto error;
     }
@@ -274,7 +284,7 @@ void orte_info_open_components(void)
     map->type = strdup("timer");
     map->components = &opal_timer_base_components_opened;
     opal_pointer_array_add(&component_map, map);
-    
+
 #if OPAL_ENABLE_FT_CR == 1
     if (OPAL_SUCCESS != opal_crs_base_open()) {
         goto error;
@@ -506,6 +516,7 @@ void orte_info_close_components()
         (void) opal_carto_base_close();
         (void) opal_maffinity_base_close();
         (void) opal_timer_base_close();
+        (void) opal_sysinfo_base_close();
 #if OPAL_ENABLE_FT_CR == 1
         (void) opal_crs_base_close();
 #endif
diff --git a/orte/tools/orte-info/orte-info.c b/orte/tools/orte-info/orte-info.c
index f33fb23103..f24f114725 100644
--- a/orte/tools/orte-info/orte-info.c
+++ b/orte/tools/orte-info/orte-info.c
@@ -192,6 +192,7 @@ int main(int argc, char *argv[])
     opal_pointer_array_add(&mca_types, "maffinity");
     opal_pointer_array_add(&mca_types, "timer");
     opal_pointer_array_add(&mca_types, "installdirs");
+    opal_pointer_array_add(&mca_types, "sysinfo");
 #if OPAL_ENABLE_FT_CR == 1
     opal_pointer_array_add(&mca_types, "crs");
 #endif