Fix some errors in the bproc components that prevented compiling. Thought I had already done this, but either those changes were lost when I did the merge, or my old man's memory is fading....

Whaz-at??? :-)

This commit was SVN r12874.

orte/mca/pls/bproc/pls_bproc.c

@@ -743,7 +743,7 @@ cleanup:
 
 
 static int
-orte_pls_bproc_node_failed(orte_gpr_notify_msg_t *msg) 
+orte_pls_bproc_node_failed(orte_gpr_notify_message_t *msg) 
 {
     orte_jobid_t job;
     
@@ -764,7 +764,7 @@ orte_pls_bproc_node_failed(orte_gpr_notify_msg_t *msg)
     printf("mpirun has detected a dead node within the job and is terminating\n");
     
     /* extract the jobid from the returned data */
-    orte_schema.extract_jobid_from_std_trigger_name(&job, msg->trigger);
+    orte_schema.extract_jobid_from_std_trigger_name(&job, msg->target);
     
     /* terminate all jobs in the in the job family */
     orte_pls_bproc_terminate_job(job, NULL);

orte/mca/smr/bproc/smr_bproc.c

@@ -58,6 +58,7 @@
 /* define some local variables/types */
 typedef unsigned int bit_set;
 static opal_list_t active_node_list;
+static bool initialized=false;
 
 static inline void set_bit(bit_set *set, int bit)
 {
@@ -86,7 +87,6 @@ static inline int empty_set(bit_set set)
 	return set == EMPTY_SET;
 }
 
-static int orte_smr_bproc_finalize(void);
 
 /** 
  * Query the bproc node status
@@ -247,7 +247,7 @@ static void update_registry(bit_set changes, struct bproc_node_info_t *ni)
     }
 
     ret = orte_schema.get_node_tokens(&(value->tokens), &(value->num_tokens), 
-	    mca_smr_bproc_component.cellid, node_name);
+	    ORTE_PROC_MY_NAME->cellid, node_name);
 
     if (ret != ORTE_SUCCESS) {
     	ORTE_ERROR_LOG(ret);
@@ -370,13 +370,9 @@ static void orte_smr_bproc_notify_handler(int fd, short flags, void *user)
  */
 static int orte_smr_bproc_module_init(void)
 {
-    int rc;
-    
     if (mca_smr_bproc_component.debug)
 	    opal_output(0, "init smr_bproc_module\n");
 
-    mca_smr_bproc_component.cellid = ORTE_PROC_MY_NAME->cellid;
-
     mca_smr_bproc_component.node_set.size = 0;
 
     /* construct the monitored node list so we can track who is being monitored */
@@ -391,6 +387,9 @@ static int orte_smr_bproc_module_init(void)
 int orte_smr_bproc_begin_monitoring(orte_job_map_t *map, orte_gpr_trigger_cb_fn_t cbfunc, void *user_tag)
 {
     struct bproc_node_set_t ns = BPROC_EMPTY_NODESET;
+    opal_list_item_t *item;
+    orte_mapped_node_t *node;
+    orte_smr_node_state_tracker_t *newnode;
 
     /* if our internal structures haven't been initialized, then
      * set them up
@@ -448,7 +447,7 @@ int orte_smr_bproc_begin_monitoring(orte_job_map_t *map, orte_gpr_trigger_cb_fn_
     
     opal_event_add(&mca_smr_bproc_component.notify_event, 0);
     
-    
+    return ORTE_SUCCESS;
 }
 /**
  *  Cleanup

orte/mca/smr/bproc/smr_bproc.h

@@ -45,7 +45,6 @@ extern "C" {
 /**
  * Module init/fini
  */
-int orte_smr_bproc_init(void);
 int orte_smr_bproc_finalize(void);
 int orte_smr_bproc_begin_monitoring(orte_job_map_t *map,
                                     orte_gpr_trigger_cb_fn_t cbfunc,

orte/mca/smr/bproc/smr_bproc_component.c

@@ -22,6 +22,8 @@
 #include "opal/mca/base/mca_base_param.h"
 #include "orte/util/proc_info.h"
 #include "opal/util/output.h"
+
+#include "orte/mca/smr/base/smr_private.h"
 #include "orte/mca/smr/bproc/smr_bproc.h"
 
 /*
@@ -30,7 +32,7 @@
 
 static int orte_smr_bproc_open(void);
 static int orte_smr_bproc_close(void);
-static orte_smr_base_module_t* orte_smr_bproc_init(int*);
+static orte_smr_base_module_t* orte_smr_bproc_init(int *priority);
 
 orte_smr_bproc_component_t mca_smr_bproc_component = {
     {
@@ -65,8 +67,8 @@ orte_smr_bproc_component_t mca_smr_bproc_component = {
 orte_smr_base_module_t orte_smr_bproc_module = {
     orte_smr_base_get_proc_state,
     orte_smr_base_set_proc_state,
-    orte_smr_base_get_node_state_not_available,
-    orte_smr_base_set_node_state_not_available,
+    orte_smr_base_get_node_state,
+    orte_smr_base_set_node_state,
     orte_smr_base_get_job_state,
     orte_smr_base_set_job_state,
     orte_smr_bproc_begin_monitoring,

orte/mca/smr/smr.h

@@ -182,7 +182,7 @@ struct orte_smr_base_module_1_3_0_t {
     orte_smr_base_module_set_node_state_fn_t            set_node_state;
     orte_smr_base_module_get_job_state_fn_t             get_job_state;
     orte_smr_base_module_set_job_state_fn_t             set_job_state;
-    orte_smr_base_module_begin_monitoring_fn_t          begin_monitoring_job;
+    orte_smr_base_module_begin_monitoring_fn_t          begin_monitoring;
     /* TRIGGER INIT FUNCTIONS */
     orte_smr_base_module_job_stage_gate_init_fn_t       init_job_stage_gates;
     orte_smr_base_module_orted_stage_gate_init_fn_t     init_orted_stage_gates;