get bproc to compile, other issues still remain..

This commit was SVN r14661.

orte/mca/pls/bproc/pls_bproc.c

@@ -457,7 +457,7 @@ static int orte_pls_bproc_launch_daemons(orte_job_map_t *map, char ***envp) {
     orte_std_cntr_t idx;
     struct stat buf;
     struct timeval joblaunchstart, launchstart, launchstop;
-
+    opal_list_item_t* item;
     OPAL_TRACE(1);
     
     if (orte_pls_base.timing) {
@@ -813,7 +813,7 @@ static int orte_pls_bproc_launch_app(orte_job_map_t* map, int num_slots,
     struct bproc_io_t bproc_io[3];
     char **env;
     int dbg;
-    bool app_launched = false;
+    bool apps_launched = false;
 
     OPAL_TRACE(1);
     
@@ -1268,10 +1268,11 @@ int orte_pls_bproc_terminate_orteds(struct timeval *timeout, opal_list_t *attrs)
 int orte_pls_bproc_terminate_proc(const orte_process_name_t* proc_name) {
     int rc;
     pid_t pid;
+    char* node_name;
 
     OPAL_TRACE(1);
     
-    if(ORTE_SUCCESS != (rc = orte_rmgr.get_process_pid(proc_name, &pid)))
+    if(ORTE_SUCCESS != (rc = orte_rmgr.get_process_info(proc_name, &pid, &node_name)))
         return rc;
     if(kill(pid, mca_pls_bproc_component.terminate_sig) != 0) {
         switch(errno) {
@@ -1320,10 +1321,10 @@ int orte_pls_bproc_signal_job(orte_jobid_t jobid, int32_t signal, opal_list_t *a
 int orte_pls_bproc_signal_proc(const orte_process_name_t* proc_name, int32_t signal) {
     int rc;
     pid_t pid;
-
+    char* node_name;
     OPAL_TRACE(1);
 
-    if(ORTE_SUCCESS != (rc = orte_rmgr.get_process_pid(proc_name, &pid)))
+    if(ORTE_SUCCESS != (rc = orte_rmgr.get_process_info(proc_name, &pid, &node_name)))
         return rc;
     if(kill(pid, (int)signal) != 0) {
         switch(errno) {

orte/mca/pls/bproc/pls_bproc.h

@@ -77,7 +77,7 @@ int orte_pls_bproc_finalize(void);
 int orte_pls_bproc_launch(orte_jobid_t);
 int orte_pls_bproc_terminate_job(orte_jobid_t, struct timeval *timeout, opal_list_t*);
 int orte_pls_bproc_terminate_proc(const orte_process_name_t* proc_name);
-int orte_pls_bproc_terminate_orteds(orte_jobid_t jobid, struct timeval *timeout, opal_list_t*);
+int orte_pls_bproc_terminate_orteds(struct timeval *timeout, opal_list_t*);
 int orte_pls_bproc_signal_job(orte_jobid_t, int32_t, opal_list_t*);
 int orte_pls_bproc_signal_proc(const orte_process_name_t* proc_name, int32_t);
 int orte_pls_bproc_cancel_operation(void);

orte/mca/pls/bproc/pls_bproc_state.c

@@ -42,12 +42,17 @@
 
 int orte_pls_bproc_set_proc_pid(const orte_process_name_t *name, pid_t pid, int nodenum)
 {
-    int rc = ORTE_SUCCESS;
-    char * nodename = NULL;
-    
+    int rc = ORTE_SUCCESS, i;
+    char *nodename = NULL;
+    char *segment = NULL, **tokens, *keys[2];
+    orte_std_cntr_t num_tokens;
+    orte_std_cntr_t num_values;
+    orte_gpr_value_t** values = NULL;
+    pid_t *pptr;
+        
     asprintf(&nodename, "%ld", (long)nodenum);
 
-    if (ORTE_SUCCESS != (rc = orte_rmgr.set_process_pid(name, pid, nodename) ) ) {
+    if (ORTE_SUCCESS != (rc = orte_rmgr.set_process_info(name, pid, nodename) ) ) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -59,7 +64,7 @@ int orte_pls_bproc_set_proc_pid(const orte_process_name_t *name, pid_t pid, int
     }
 
     if(ORTE_SUCCESS != (rc = orte_schema.get_proc_tokens(&tokens, &num_tokens, (orte_process_name_t*)name))) {
-        free(segment);
+        free(nodename);
         ORTE_ERROR_LOG(rc);
         return rc;
     }
@@ -94,7 +99,7 @@ int orte_pls_bproc_set_proc_pid(const orte_process_name_t *name, pid_t pid, int
         ORTE_ERROR_LOG(rc);
         goto cleanup;
     }
-    *pid = *pptr;
+    pid = *pptr;
 
 cleanup:
     if(NULL != values) {

orte/tools/orted/orted.c

@@ -50,6 +50,8 @@
 #include "opal/util/trace.h"
 #include "opal/util/argv.h"
 #include "opal/runtime/opal.h"
+#include "opal/mca/base/mca_base_param.h"
+
 
 #include "orte/dss/dss.h"
 #include "orte/class/orte_value_array.h"
@@ -70,6 +72,7 @@
 #include "orte/mca/odls/odls.h"
 #include "orte/mca/pls/pls.h"
 
+
 #include "orte/runtime/runtime.h"
 #include "orte/runtime/params.h"
 
@@ -82,6 +85,8 @@ extern char** environ;
 /*
  * Globals
  */
+
+extern bool opal_mca_base_param_use_amca_sets;
 orted_globals_t orted_globals;
 
 static struct opal_event term_handler;
@@ -214,7 +219,8 @@ int main(int argc, char *argv[])
      * Do not parse the Aggregate Parameter Sets in this pass.
      * we will get to them in a moment
      */
-    opal_mca_base_param_use_amca_sets = false;
+    /* GMS: what does this do and why is it gone now? */
+    /* opal_mca_base_param_use_mca_sets = false; */
     mca_base_param_init();
     
     /* setup to check common command line options that just report and die */
@@ -281,7 +287,9 @@ int main(int argc, char *argv[])
          * Need to recache the files since the user might have given us 
          * Aggregate MCA parameters that need to be reinitalized.
          */
+        /* GMS not sure what this does or where it went? */
         opal_mca_base_param_use_amca_sets = true;
+
         mca_base_param_recache_files(true);
     }
     else {