1
1

Fixes CID 1369067 and CID 1196684

Fixes CID 1369648

    Fixes CID 1372409
Этот коммит содержится в:
Ralph Castain 2016-09-06 08:43:15 -07:00
родитель 527efec4fb
Коммит f85dcaee2a
4 изменённых файлов: 16 добавлений и 1 удалений

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

@ -1047,6 +1047,7 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
if (ORTE_SUCCESS != (rc = fork_local(app, child, app->env, jobdat))) { if (ORTE_SUCCESS != (rc = fork_local(app, child, app->env, jobdat))) {
child->exit_code = rc; /* error message already output */ child->exit_code = rc; /* error message already output */
ORTE_ACTIVATE_PROC_STATE(&child->name, ORTE_PROC_STATE_FAILED_TO_START); ORTE_ACTIVATE_PROC_STATE(&child->name, ORTE_PROC_STATE_FAILED_TO_START);
continue;
} }
orte_wait_cb(child, odls_base_default_wait_local_proc, NULL); orte_wait_cb(child, odls_base_default_wait_local_proc, NULL);
/* if we indexed the argv, we need to restore it to /* if we indexed the argv, we need to restore it to
@ -1055,7 +1056,12 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
if (index_argv) { if (index_argv) {
/* restore the argv[0] */ /* restore the argv[0] */
char *param; char *param;
param = strrchr(app->argv[0], '-'); if (NULL == (param = strrchr(app->argv[0], '-'))) {
child->exit_code = ORTE_ERR_NOT_FOUND;
rc = ORTE_ERR_NOT_FOUND;
ORTE_ACTIVATE_PROC_STATE(&child->name, ORTE_PROC_STATE_FAILED_TO_START);
continue;
}
*param = '\0'; *param = '\0';
} }
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {

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

@ -822,6 +822,10 @@ static int component_set_addr(orte_process_name_t *peer,
ORTE_NAME_PRINT(peer), uris[i]); ORTE_NAME_PRINT(peer), uris[i]);
/* separate the ports from the network addrs */ /* separate the ports from the network addrs */
ports = strrchr(tcpuri, ':'); ports = strrchr(tcpuri, ':');
if (NULL == ports) {
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
continue;
}
*ports = '\0'; *ports = '\0';
ports++; ports++;

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

@ -222,6 +222,7 @@ static int component_startup(void)
"usock", NULL); "usock", NULL);
if ((strlen(session) + 1) > sizeof(mca_oob_usock_component.address.sun_path)-1) { if ((strlen(session) + 1) > sizeof(mca_oob_usock_component.address.sun_path)-1) {
opal_output(0, "SESSION DIR TOO LONG"); opal_output(0, "SESSION DIR TOO LONG");
free(session);
return ORTE_ERR_NOT_SUPPORTED; return ORTE_ERR_NOT_SUPPORTED;
} }
snprintf(mca_oob_usock_component.address.sun_path, snprintf(mca_oob_usock_component.address.sun_path,

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

@ -266,6 +266,10 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
seq_list = &sq_list; seq_list = &sq_list;
} else if (orte_get_attribute(&app->attributes, ORTE_APP_HOSTFILE, (void**)&hosts, OPAL_STRING)) { } else if (orte_get_attribute(&app->attributes, ORTE_APP_HOSTFILE, (void**)&hosts, OPAL_STRING)) {
char *hstname; char *hstname;
if (NULL == hosts) {
rc = ORTE_ERR_NOT_FOUND;
goto error;
}
opal_output_verbose(5, orte_rmaps_base_framework.framework_output, opal_output_verbose(5, orte_rmaps_base_framework.framework_output,
"mca:rmaps:seq: using hostfile %s nodes on app %s", hosts, app->app); "mca:rmaps:seq: using hostfile %s nodes on app %s", hosts, app->app);
OBJ_CONSTRUCT(&sq_list, opal_list_t); OBJ_CONSTRUCT(&sq_list, opal_list_t);