1
1
This commit was SVN r25101.
Этот коммит содержится в:
Ralph Castain 2011-08-27 14:27:15 +00:00
родитель 56ebfa23cc
Коммит 03ddf8520b
2 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -1921,7 +1921,6 @@ static void cbfunc(int status,
int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) { int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) {
orte_job_t *jdat; orte_job_t *jdat;
orte_proc_t *pdat, *proc_item; orte_proc_t *pdat, *proc_item;
orte_process_name_t *proc_name;
int i; int i;
opal_pointer_array_t *dead_names; opal_pointer_array_t *dead_names;
@ -1968,6 +1967,7 @@ int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc) {
*/ */
int rc, num_failed = opal_pointer_array_get_size(dead_names); int rc, num_failed = opal_pointer_array_get_size(dead_names);
opal_buffer_t* buffer = OBJ_NEW(opal_buffer_t); opal_buffer_t* buffer = OBJ_NEW(opal_buffer_t);
orte_process_name_t *proc_name;
if (ORTE_SUCCESS != (rc = opal_dss.pack(buffer, &num_failed, 1, ORTE_VPID))) { if (ORTE_SUCCESS != (rc = opal_dss.pack(buffer, &num_failed, 1, ORTE_VPID))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);

Просмотреть файл

@ -63,9 +63,9 @@ static void update_local_children(orte_odls_job_t *jobdat,
orte_job_state_t jobstate, orte_job_state_t jobstate,
orte_proc_state_t state); orte_proc_state_t state);
static void killprocs(orte_jobid_t job, orte_vpid_t vpid); static void killprocs(orte_jobid_t job, orte_vpid_t vpid);
static int record_dead_process(orte_process_name_t *proc);
static int mark_processes_as_dead(opal_pointer_array_t *dead_procs);
#if ORTE_RESIL_ORTE #if ORTE_RESIL_ORTE
static int mark_processes_as_dead(opal_pointer_array_t *dead_procs);
static int record_dead_process(orte_process_name_t *proc);
static int send_to_local_applications(opal_pointer_array_t *dead_names); static int send_to_local_applications(opal_pointer_array_t *dead_names);
static void failure_notification(int status, orte_process_name_t* sender, static void failure_notification(int status, orte_process_name_t* sender,
opal_buffer_t *buffer, orte_rml_tag_t tag, opal_buffer_t *buffer, orte_rml_tag_t tag,
@ -667,6 +667,7 @@ static int ft_event(int state)
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if ORTE_RESIL_ORTE
static int mark_processes_as_dead(opal_pointer_array_t *dead_procs) { static int mark_processes_as_dead(opal_pointer_array_t *dead_procs) {
int i; int i;
orte_process_name_t *name_item; orte_process_name_t *name_item;
@ -731,7 +732,6 @@ static int mark_processes_as_dead(opal_pointer_array_t *dead_procs) {
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }
#if ORTE_RESIL_ORTE
static void failure_notification(int status, orte_process_name_t* sender, static void failure_notification(int status, orte_process_name_t* sender,
opal_buffer_t *buffer, orte_rml_tag_t tag, opal_buffer_t *buffer, orte_rml_tag_t tag,
void* cbdata) void* cbdata)
@ -1076,6 +1076,7 @@ static void killprocs(orte_jobid_t job, orte_vpid_t vpid)
OBJ_DESTRUCT(&proc); OBJ_DESTRUCT(&proc);
} }
#if ORTE_RESIL_ORTE
static int record_dead_process(orte_process_name_t *proc) { static int record_dead_process(orte_process_name_t *proc) {
opal_pointer_array_t *dead_name; opal_pointer_array_t *dead_name;
opal_buffer_t *buffer; opal_buffer_t *buffer;
@ -1112,7 +1113,6 @@ static int record_dead_process(orte_process_name_t *proc) {
return rc; return rc;
} }
#if ORTE_RESIL_ORTE
int send_to_local_applications(opal_pointer_array_t *dead_names) { int send_to_local_applications(opal_pointer_array_t *dead_names) {
opal_buffer_t *buf; opal_buffer_t *buf;
int ret; int ret;