Move the name of the bproc common segment to the central schema location - avoids conflicts when bproc 3 components try to build

This commit was SVN r12654.

orte/mca/pls/bproc/pls_bproc.c

@@ -65,12 +65,11 @@
 #include "orte/mca/rmgr/rmgr.h"
 #include "orte/mca/rmaps/rmaps.h"
 #include "orte/mca/rml/rml.h"
+#include "orte/mca/schema/schema_types.h"
 #include "orte/mca/smr/smr.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/runtime/runtime.h"
 
-#include "orte/mca/smr/bproc/smr_bproc.h"
-
 #include "orte/mca/pls/base/pls_private.h"
 #include "pls_bproc.h"
 
@@ -864,7 +863,7 @@ orte_pls_bproc_monitor_nodes(void)
                                 ORTE_GPR_NOTIFY_VALUE_CHG,
                                 ORTE_GPR_TOKENS_OR | 
                                 ORTE_GPR_KEYS_OR,
-                                ORTE_SMR_BPROC_NODE_SEGMENT,
+                                ORTE_BPROC_NODE_SEGMENT,
                                 NULL,
                                 ORTE_NODE_STATE_KEY,
                                 orte_pls_bproc_check_node_state,

orte/mca/schema/schema_types.h

@@ -121,4 +121,13 @@
 #define ORTED_LAUNCH_STAGE_GATE_CNTR        "orted-num-at-launch-gate"
 #define ORTED_NUM_TO_BE_LAUNCHED            "orted-num-to-be-launched"
 
+/*
+ * BPROC-SPECIFIC SEGMENT FOR STORING CLUSTER-WIDE NODE STATES
+ * This obviously shouldn't be in a general ORTE schema file. However,
+ * it is a temporary requirement until we can install the ORTE 2.0
+ * schema - and the definition needs to be in some central location
+ * where the various bproc components can locate it
+ */
+#define ORTE_BPROC_NODE_SEGMENT     "orte-node-bproc-segment"
+
 #endif

orte/mca/smr/bproc/smr_bproc.c

@@ -32,6 +32,8 @@
 #include "orte/mca/ns/ns.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/gpr/base/base.h"
+#include "orte/mca/schema/schema_types.h"
+
 #include "orte/mca/smr/base/smr_private.h"
 #include "orte/mca/smr/bproc/smr_bproc.h"
 #include "opal/util/output.h"
@@ -152,7 +154,7 @@ static void update_registry(bit_set changes, struct bproc_node_info_t *ni)
 	return;
 
     if (ORTE_SUCCESS != (rc = orte_gpr.create_value(&value, ORTE_GPR_OVERWRITE | ORTE_GPR_TOKENS_AND,
-	                                                ORTE_SMR_BPROC_NODE_SEGMENT, cnt, 0))) {
+	                                                ORTE_BPROC_NODE_SEGMENT, cnt, 0))) {
     	ORTE_ERROR_LOG(rc);
     	return;
     }

orte/mca/smr/bproc/smr_bproc.h

@@ -37,7 +37,6 @@ extern "C" {
 #define ORTE_SMR_BPROC_NODE_MODE        "orte-node-bproc-mode"
 #define ORTE_SMR_BPROC_NODE_USER        "orte-node-bproc-user"
 #define ORTE_SMR_BPROC_NODE_GROUP       "orte-node-bproc-group"
-#define ORTE_SMR_BPROC_NODE_SEGMENT     "orte-node-bproc-segment"
 
 /**
  * Module init/fini