1
1

- added an error message so we don't just segfault when the specified oob

interfaces do not have valid addresses.
- properly record the pids of launched processes in the new bproc component

This commit was SVN r6553.
Этот коммит содержится в:
Tim Prins 2005-07-19 20:12:51 +00:00
родитель 5e437f9a09
Коммит acb9365793
2 изменённых файлов: 17 добавлений и 0 удалений

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

@ -976,6 +976,13 @@ int mca_oob_tcp_init(void)
tmp = mca_oob.oob_get_addr();
tmp2 = strrchr(tmp, '/');
tmp3 = strrchr(tmp, ':');
if(NULL == tmp2 || NULL == tmp3) {
opal_output(0, "[%lu,%lu,%lu] mca_oob_tcp_init: invalid address \'%s\' "
"returned for selected oob interfaces.\n",
ORTE_NAME_ARGS(orte_process_info.my_name), tmp);
ORTE_ERROR_LOG(ORTE_ERROR);
return ORTE_ERROR;
}
*tmp3 = '\0';
(value->keyvals[1])->value.strptr = strdup(tmp2);
free(tmp);

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

@ -505,6 +505,11 @@ static int orte_pls_bproc_launch_app(orte_jobid_t jobid,
ORTE_ERROR_LOG(rc);
goto cleanup;
}
rc = orte_pls_base_set_proc_pid(proc_name, pids[i]);
if(ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc);
goto cleanup;
}
}
}
orte_pls_bproc_num_daemons += num_daemons;
@ -575,6 +580,11 @@ static int orte_pls_bproc_launch_app(orte_jobid_t jobid,
ORTE_ERROR_LOG(rc);
goto cleanup;
}
orte_pls_base_set_proc_pid(proc_name, pids[j]);
if(ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc);
goto cleanup;
}
rc = orte_wait_cb(pids[j], orte_pls_bproc_waitpid_cb, proc_name);
if(ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc);