With Jeff's help, get the libraries to link as required.

Update ompi_info and orte-info to include the new framework.

Fix some selection logic and a typo'd variable name

Still remains ompi_ignored until we complete testing

This commit was SVN r22848.

ompi/tools/ompi_info/components.c

@@ -82,6 +82,8 @@
 #include "orte/mca/errmgr/base/base.h"
 #include "orte/mca/grpcomm/grpcomm.h"
 #include "orte/mca/grpcomm/base/base.h"
+#include "orte/mca/state/state.h"
+#include "orte/mca/state/base/base.h"
 #include "orte/mca/ess/ess.h"
 #include "orte/mca/ess/base/base.h"
 #include "orte/mca/notifier/notifier.h"
@@ -346,6 +348,14 @@ void ompi_info_open_components(void)
     map->components = &orte_grpcomm_base.components_available;
     opal_pointer_array_add(&component_map, map);
     
+    if (ORTE_SUCCESS != orte_state_base_open()) {
+        goto error;
+    }
+    map = OBJ_NEW(ompi_info_component_map_t);
+    map->type = strdup("state");
+    map->components = &orte_state_base_components_available;
+    opal_pointer_array_add(&component_map, map);
+    
     if (ORTE_SUCCESS != orte_ess_base_open()) {
         goto error;
     }
@@ -639,6 +649,7 @@ void ompi_info_close_components()
         (void) mca_allocator_base_close();
         (void) ompi_osc_base_close();
         (void) orte_grpcomm_base_close();
+        (void) orte_state_base_close();
         (void) orte_notifier_base_close();
         (void) orte_ess_base_close();
         (void) orte_show_help_finalize();

ompi/tools/ompi_info/ompi_info.c

@@ -235,6 +235,7 @@ int main(int argc, char *argv[])
     opal_pointer_array_add(&mca_types, "errmgr");
     opal_pointer_array_add(&mca_types, "ess");
     opal_pointer_array_add(&mca_types, "grpcomm");
+    opal_pointer_array_add(&mca_types, "state");
     opal_pointer_array_add(&mca_types, "notifier");
     
     /* Execute the desired action(s) */

orte/mca/state/db/Makefile.am

@@ -26,9 +26,13 @@ endif
 
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
+mca_state_db_la_CPPFLAGS = $(state_db_CPPFLAGS)
 mca_state_db_la_SOURCES = $(sources)
-mca_state_db_la_LDFLAGS = -module -avoid-version
+mca_state_db_la_LDFLAGS = -module -avoid-version $(state_db_LDFLAGS)
+mca_state_db_la_LIBADD = $(state_db_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
+libmca_state_db_la_CPPFLAGS = $(state_db_CPPFLAGS)
 libmca_state_db_la_SOURCES =$(sources)
-libmca_state_db_la_LDFLAGS = -module -avoid-version
+libmca_state_db_la_LDFLAGS = -module -avoid-version $(state_db_LDFLAGS)
+libmca_state_db_la_LIBADD = $(state_db_LIBS)

orte/mca/state/db/configure.m4

@@ -21,4 +21,8 @@ AC_DEFUN([MCA_state_db_CONFIG], [
                        [],
                        [$1],
                        [$2])])
+
+    AC_SUBST(state_db_CPPFLAGS)
+    AC_SUBST(state_db_LDFLAGS)
+    AC_SUBST(state_db_LIBS)
 ])dnl

orte/mca/state/db/state_db_component.c

@@ -26,7 +26,7 @@
 #include "state_db.h"
 
 extern orte_state_base_module_t orte_state_db_module;
-char *orte_state_db_filename;
+char *orte_state_db_directory;
 
 /*
  * Instantiate the public struct with all of our public information
@@ -80,7 +80,7 @@ int orte_state_db_component_query(mca_base_module_t **module, int *priority)
                                    true,
                                    &is_required);
     
-    if( is_required || NULL != orte_state_db_directory) {
+    if (is_required && NULL != orte_state_db_directory) {
         *priority = 1000;
         *module = (mca_base_module_t*)&orte_state_db_module;
         return ORTE_SUCCESS;

orte/mca/state/dbm/Makefile.am

@@ -26,9 +26,13 @@ endif
 
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
+mca_state_dbm_la_CPPFLAGS = $(state_dbm_CPPFLAGS)
 mca_state_dbm_la_SOURCES = $(sources)
-mca_state_dbm_la_LDFLAGS = -module -avoid-version
+mca_state_dbm_la_LDFLAGS = -module -avoid-version $(state_dbm_LDFLAGS)
+mca_state_dbm_la_LIBADD = $(state_dbm_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
+libmca_state_dbm_la_CPPFLAGS = $(state_dbm_CPPFLAGS)
 libmca_state_dbm_la_SOURCES =$(sources)
-libmca_state_dbm_la_LDFLAGS = -module -avoid-version
+libmca_state_dbm_la_LDFLAGS = -module -avoid-version $(state_dbm_LDFLAGS)
+libmca_state_dbm_la_LIBADD = $(state_dbm_LIBS)

orte/mca/state/dbm/configure.m4

@@ -21,4 +21,8 @@ AC_DEFUN([MCA_state_dbm_CONFIG], [
                        [],
                        [$1],
                        [$2])])
+
+    AC_SUBST(state_dbm_CPPFLAGS)
+    AC_SUBST(state_dbm_LDFLAGS)
+    AC_SUBST(state_dbm_LIBS)
 ])dnl

orte/mca/state/dbm/state_dbm_component.c

@@ -26,7 +26,7 @@
 #include "state_dbm.h"
 
 extern orte_state_base_module_t orte_state_dbm_module;
-char *orte_state_dbm_filename;
+char *orte_state_dbm_directory;
 
 /*
  * Instantiate the public struct with all of our public information
@@ -80,7 +80,7 @@ int orte_state_dbm_component_query(mca_base_module_t **module, int *priority)
                                    true,
                                    &is_required);
     
-    if( is_required || NULL != orte_state_dbm_directory) {
+    if (is_required && NULL != orte_state_dbm_directory) {
         *priority = 1000;
         *module = (mca_base_module_t*)&orte_state_dbm_module;
         return ORTE_SUCCESS;

orte/tools/orte-info/components.c

@@ -56,6 +56,8 @@
 #include "orte/mca/errmgr/base/base.h"
 #include "orte/mca/grpcomm/grpcomm.h"
 #include "orte/mca/grpcomm/base/base.h"
+#include "orte/mca/state/state.h"
+#include "orte/mca/state/base/base.h"
 #include "orte/mca/ess/ess.h"
 #include "orte/mca/ess/base/base.h"
 #include "orte/mca/notifier/notifier.h"
@@ -313,6 +315,14 @@ void orte_info_open_components(void)
     map->components = &orte_grpcomm_base.components_available;
     opal_pointer_array_add(&component_map, map);
     
+    if (ORTE_SUCCESS != orte_state_base_open()) {
+        goto error;
+    }
+    map = OBJ_NEW(orte_info_component_map_t);
+    map->type = strdup("state");
+    map->components = &orte_state_base_components_available;
+    opal_pointer_array_add(&component_map, map);
+
     if (ORTE_SUCCESS != orte_ess_base_open()) {
         goto error;
     }
@@ -468,6 +478,7 @@ void orte_info_close_components()
          */
         
         (void) orte_grpcomm_base_close();
+        (void) orte_state_base_close();
         (void) orte_notifier_base_close();
         (void) orte_ess_base_close();
         (void) orte_show_help_finalize();

orte/tools/orte-info/orte-info.c

@@ -215,6 +215,7 @@ int main(int argc, char *argv[])
     opal_pointer_array_add(&mca_types, "errmgr");
     opal_pointer_array_add(&mca_types, "ess");
     opal_pointer_array_add(&mca_types, "grpcomm");
+    opal_pointer_array_add(&mca_types, "state");
     opal_pointer_array_add(&mca_types, "notifier");
     
     /* Execute the desired action(s) */