Correctly register the component MCA parameters.

Few cleanups in the includes. This commit was SVN r28645.
2013-06-15 16:05:09 +00:00 · 2013-06-15 16:05:09 +00:00 · b4ebc417a1
--- a/orte/mca/sstore/base/base.h
+++ b/orte/mca/sstore/base/base.h
@ -14,8 +14,6 @@

 #include "orte_config.h"

-#include "orte/mca/rml/rml.h"
-
 #include "orte/mca/sstore/sstore.h"

 /*
--- a/orte/mca/sstore/base/sstore_base_fns.c
+++ b/orte/mca/sstore/base/sstore_base_fns.c
@ -35,9 +35,8 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/argv.h"
+#include "opal/mca/crs/base/base.h"

-#include "orte/mca/rml/rml.h"
-#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/runtime/orte_globals.h"
 #include "orte/util/proc_info.h"
--- a/orte/mca/sstore/base/sstore_base_frame.c
+++ b/orte/mca/sstore/base/sstore_base_frame.c
@ -17,6 +17,7 @@
 #include "orte/constants.h"
 #include "opal/mca/mca.h"
 #include "opal/util/output.h"
+#include "opal/util/opal_environ.h"
 #include "opal/mca/base/base.h"

 #include "orte/util/proc_info.h"
--- a/orte/mca/sstore/central/sstore_central_app.c
+++ b/orte/mca/sstore/central/sstore_central_app.c
@ -47,6 +47,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"

 #include "orte/mca/sstore/sstore.h"
--- a/orte/mca/sstore/central/sstore_central_component.c
+++ b/orte/mca/sstore/central/sstore_central_component.c
@ -67,21 +67,21 @@ orte_sstore_central_component_t mca_sstore_central_component = {

 static int sstore_central_register (void)
 {
-    (void) mca_base_var_register (&mca_sstore_central_component.super.base_version,
-                                  "verbose", "Verbose level for the SSTORE central component",
-                                  MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
-                                  OPAL_INFO_LVL_9,
-                                  MCA_BASE_VAR_SCOPE_LOCAL,
-                                  &mca_sstore_central_component.super.verbose);
+    (void)mca_base_component_var_register(&mca_sstore_central_component.super.base_version,
+                                          "verbose", "Verbose level for the SSTORE central component",
+                                          MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                          OPAL_INFO_LVL_9,
+                                          MCA_BASE_VAR_SCOPE_LOCAL,
+                                          &mca_sstore_central_component.super.verbose);

    /* Default priority */
    mca_sstore_central_component.super.priority = 20;
-    (void) mca_base_var_register (&mca_sstore_central_component.super.base_version,
-                                  "priority", "Priority of the SSTORE central component",
-                                  MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
-                                  OPAL_INFO_LVL_9,
-                                  MCA_BASE_VAR_SCOPE_READONLY,
-                                  &mca_sstore_central_component.super.priority);
+    (void)mca_base_component_var_register(&mca_sstore_central_component.super.base_version,
+                                          "priority", "Priority of the SSTORE central component",
+                                          MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
+                                          OPAL_INFO_LVL_9,
+                                          MCA_BASE_VAR_SCOPE_READONLY,
+                                          &mca_sstore_central_component.super.priority);

    return ORTE_SUCCESS;
 }
--- a/orte/mca/sstore/central/sstore_central_global.c
+++ b/orte/mca/sstore/central/sstore_central_global.c
@ -50,6 +50,7 @@
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/ess/ess.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/snapc/snapc.h"
 #include "orte/mca/snapc/base/base.h"
--- a/orte/mca/sstore/central/sstore_central_local.c
+++ b/orte/mca/sstore/central/sstore_central_local.c
@ -48,6 +48,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/odls/odls_types.h"

--- a/orte/mca/sstore/stage/sstore_stage_global.c
+++ b/orte/mca/sstore/stage/sstore_stage_global.c
@ -55,6 +55,7 @@
 #include "orte/mca/errmgr/base/base.h"
 #include "orte/mca/errmgr/base/errmgr_private.h"
 #include "orte/mca/ess/ess.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/filem/filem.h"
 #include "orte/mca/grpcomm/grpcomm.h"
--- a/orte/mca/sstore/stage/sstore_stage_local.c
+++ b/orte/mca/sstore/stage/sstore_stage_local.c
@ -52,6 +52,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/odls/odls_types.h"
 #include "orte/mca/filem/filem.h"
--- a/orte/mca/sstore/stage/sstore_stage_module.c
+++ b/orte/mca/sstore/stage/sstore_stage_module.c
@ -45,7 +45,6 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
-#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/snapc/snapc.h"

 #include "orte/mca/sstore/sstore.h"