Modify the bproc components to resolve the current allocation problem

This commit was SVN r12652.

orte/mca/pls/bproc/pls_bproc.c

@@ -69,6 +69,8 @@
 #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"
 
@@ -862,7 +864,7 @@ orte_pls_bproc_monitor_nodes(void)
                                 ORTE_GPR_NOTIFY_VALUE_CHG,
                                 ORTE_GPR_TOKENS_OR | 
                                 ORTE_GPR_KEYS_OR,
-                                ORTE_NODE_SEGMENT,
+                                ORTE_SMR_BPROC_NODE_SEGMENT,
                                 NULL,
                                 ORTE_NODE_STATE_KEY,
                                 orte_pls_bproc_check_node_state,

orte/mca/ras/bjs/ras_bjs.c

@@ -123,7 +123,6 @@ static int orte_ras_bjs_discover(
     opal_list_t new_nodes;
     int rc;
     
-#if 0
     /* query the nodelist from the registry */
     OBJ_CONSTRUCT(&new_nodes, opal_list_t);
     if(ORTE_SUCCESS != (rc = orte_ras_base_node_query(nodelist))) {
@@ -161,13 +160,10 @@ static int orte_ras_bjs_discover(
 
         /* try and determine the number of available slots */
         if(node->node_slots == 0) {
-            node->node_slots_inuse = 0;
-            node->node_slots_max = 0;
             node->node_slots = orte_ras_bjs_node_slots(node->node_name);
         }
         item = next;
     }
-#endif    
 
     /* parse the node list and check node status/access */
     nodes = getenv("NODES");
@@ -210,9 +206,6 @@ static int orte_ras_bjs_discover(
         node = OBJ_NEW(orte_ras_node_t);
         node->node_name = strdup(ptr);
         node->node_state = node_state;
-        node->node_cellid = 0;
-        node->node_slots_inuse = 0;
-        node->node_slots_max = 0;
         node->node_slots = orte_ras_bjs_node_slots(node->node_name);
         opal_list_append(&new_nodes, &node->super);
     }

orte/mca/smr/bproc/smr_bproc.c

@@ -152,7 +152,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_NODE_SEGMENT, cnt, 0))) {
+	                                                ORTE_SMR_BPROC_NODE_SEGMENT, cnt, 0))) {
     	ORTE_ERROR_LOG(rc);
     	return;
     }

orte/mca/smr/bproc/smr_bproc.h

@@ -37,7 +37,7 @@ 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