Update the Cray XT3 run-time support files to compile with latest RTE changes

This commit was SVN r13172.

orte/mca/pls/cnos/pls_cnos.c

@@ -70,69 +70,54 @@ extern int killrank(rank_t RANK, int SIG);
 
 static int orte_pls_cnos_terminate_job(orte_jobid_t jobid, opal_list_t *attrs)
 {
-#ifdef HAVE_KILLRANK
-    orte_jobid_t my_jobid;
-
-    my_jobid = orte_process_info.my_name->jobid;
+    orte_jobid_t my_jobid = ORTE_PROC_MY_NAME->jobid;
 
     /* make sure it's my job */
     if (jobid == my_jobid) {
+#ifdef HAVE_KILLRANK
         killrank(-1, SIGKILL);
-    } else {
-        return ORTE_ERR_NOT_SUPPORTED;
-    }
 #else
-    exit(0);
+        exit(0);
 #endif
+    }
 
-    return ORTE_SUCCESS;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 
 static int orte_pls_cnos_terminate_orteds(orte_jobid_t jobid, opal_list_t *attrs)
 {
-#ifdef HAVE_KILLRANK
-    orte_jobid_t my_jobid;
-    
-    my_jobid = orte_process_info.my_name->jobid;
+    orte_jobid_t my_jobid = ORTE_PROC_MY_NAME->jobid;
     
     /* make sure it's my job */
     if (jobid == my_jobid) {
+#ifdef HAVE_KILLRANK
         killrank(-1, SIGKILL);
-    } else {
-        return ORTE_ERR_NOT_SUPPORTED;
-    }
 #else
-    exit(0);
+        exit(0);
 #endif
-    
-    return ORTE_SUCCESS;
+    }
+
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 static int orte_pls_cnos_terminate_proc(const orte_process_name_t* proc_name)
 {
-#ifdef HAVE_KILLRANK
-    orte_jobid_t my_jobid;
-    orte_jobid_t his_jobid;
-    orte_vpid_t his_vpid;
-
-    orte_ns.get_jobid(&my_jobid, orte_process_info.my_name);
-    orte_ns.get_jobid(&his_jobid, proc_name);
-
-    orte_ns.get_vpid(&his_vpid, proc_name);
+    orte_jobid_t my_jobid = ORTE_PROC_MY_NAME->jobid;
+    orte_jobid_t his_jobid = proc_name->jobid;
+    orte_vpid_t his_vpid = proc_name->vpid;
 
     /* make sure it's my job.  This may end up killing me, but what
        the heck. */
     if (his_jobid == my_jobid) {
+#ifdef HAVE_KILLRANK
         killrank((int) his_vpid, SIGKILL);
-    } else {
-        return ORTE_ERR_NOT_SUPPORTED;
-    }
 #else
-    exit(0);
+        exit(0);
 #endif
+    }
 
-    return ORTE_SUCCESS;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 

orte/mca/pls/cnos/pls_cnos_component.c

@@ -77,7 +77,7 @@ static int orte_pls_cnos_open(void)
 }
 
 
-static orte_rmgr_base_module_t *orte_pls_cnos_init(int* priority)
+static orte_pls_base_module_t *orte_pls_cnos_init(int* priority)
 {
     /* if we can build, then we need to be selected, so
      * set a priority higher than the proxy component

orte/mca/rmgr/cnos/rmgr_cnos.c

@@ -129,8 +129,11 @@ static int orte_rmgr_cnos_spawn_job(
     orte_app_context_t** app_context,
     orte_std_cntr_t num_context,
     orte_jobid_t* jobid,
-    orte_rmgr_cb_fn_t cbfunc,
-    orte_proc_state_t cb_conditions)
+    orte_std_cntr_t num_connect,
+    orte_process_name_t *connect,
+    orte_rmgr_cb_fn_t cbfn,
+    orte_proc_state_t cb_conditions,
+    opal_list_t *attributes)
 {
     return ORTE_ERR_NOT_SUPPORTED;
 }
@@ -201,11 +204,12 @@ static int orte_rmgr_cnos_get_vpid_range(orte_jobid_t jobid,
 
 static orte_gpr_keyval_t* orte_rmgr_cnos_find_attribute(opal_list_t* attr_list, char* key)
 {
-    return ORTE_ERR_NOT_SUPPORTED;
+    return NULL;
 }
 
 static int orte_rmgr_cnos_add_attribute(opal_list_t* attr_list, char* key,
-                                        orte_data_type_t type, void *data)
+                                        orte_data_type_t type, void *data,
+                                        bool overwrite)
 {
     return ORTE_ERR_NOT_SUPPORTED;
 }