ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Improve diagnostic output messages when errors are hit

Просмотр исходного кода 
This commit was SVN r16457.
Этот коммит содержится в:
Ralph Castain 2007-10-16 14:51:52 +00:00
родитель ea0652d20f
Коммит 713b6e13a5
2 изменённых файлов: 18 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
orte/mca/grpcomm/basic/grpcomm_basic_module.c
Просмотреть файл

@ -677,14 +677,14 @@ static int allgather_list(opal_list_t *names, orte_buffer_t *sbuf, orte_buffer_t
if (ORTE_EQUAL != orte_dss.compare(root->name, ORTE_PROC_MY_NAME, ORTE_NAME)) { if (ORTE_EQUAL != orte_dss.compare(root->name, ORTE_PROC_MY_NAME, ORTE_NAME)) {
/* everyone but root sends data */ /* everyone but root sends data */
if (0 > orte_rml.send_buffer(root->name, sbuf, ORTE_RML_TAG_ALLGATHER_LIST, 0)) { if (0 > (rc = orte_rml.send_buffer(root->name, sbuf, ORTE_RML_TAG_ALLGATHER_LIST, 0))) {
ORTE_ERROR_LOG(ORTE_ERR_COMM_FAILURE); ORTE_ERROR_LOG(rc);
return ORTE_ERR_COMM_FAILURE; return rc;
} }
/* now receive the final result */ /* now receive the final result */
if (0 > orte_rml.recv_buffer(root->name, rbuf, ORTE_RML_TAG_ALLGATHER_LIST, 0)) { if (0 > (rc = orte_rml.recv_buffer(root->name, rbuf, ORTE_RML_TAG_ALLGATHER_LIST, 0))) {
ORTE_ERROR_LOG(ORTE_ERR_COMM_FAILURE); ORTE_ERROR_LOG(rc);
return ORTE_ERR_COMM_FAILURE; return rc;
} }
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }

15
orte/mca/rml/oob/rml_oob_send.c
Просмотреть файл

@ -85,7 +85,7 @@ orte_rml_oob_send(orte_process_name_t* peer,
next = orte_routed.get_route(peer); next = orte_routed.get_route(peer);
if (next.vpid == ORTE_VPID_INVALID) { if (next.vpid == ORTE_VPID_INVALID) {
ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN); ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN);
opal_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); opal_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer));
return ORTE_ERR_ADDRESSEE_UNKNOWN; return ORTE_ERR_ADDRESSEE_UNKNOWN;
} }
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1)); msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1));
@ -124,7 +124,11 @@ orte_rml_oob_send(orte_process_name_t* peer,
flags, flags,
orte_rml_send_msg_callback, orte_rml_send_msg_callback,
msg); msg);
if (ret < 0) goto cleanup; if (ret < 0) {
ORTE_ERROR_LOG(ret);
opal_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next));
goto cleanup;
}
OPAL_THREAD_LOCK(&msg->msg_lock); OPAL_THREAD_LOCK(&msg->msg_lock);
while (!msg->msg_complete) { while (!msg->msg_complete) {
@ -163,6 +167,7 @@ orte_rml_oob_send_nb(orte_process_name_t* peer,
next = orte_routed.get_route(peer); next = orte_routed.get_route(peer);
if (next.vpid == ORTE_VPID_INVALID) { if (next.vpid == ORTE_VPID_INVALID) {
ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN); ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN);
opal_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer));
return ORTE_ERR_ADDRESSEE_UNKNOWN; return ORTE_ERR_ADDRESSEE_UNKNOWN;
} }
@ -202,7 +207,11 @@ orte_rml_oob_send_nb(orte_process_name_t* peer,
flags, flags,
orte_rml_send_msg_callback, orte_rml_send_msg_callback,
msg); msg);
if (ret < 0) OBJ_RELEASE(msg); if (ret < 0) {
ORTE_ERROR_LOG(ret);
opal_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next));
OBJ_RELEASE(msg);
}
return ret; return ret;
} }