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

Cleanup of ud/oob component

Просмотр исходного кода
Этот коммит содержится в:
Ralph Castain 2015-04-30 07:30:49 -07:00
родитель 1f8de276de
Коммит 01a9bdf4cf
2 изменённых файлов: 11 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
orte/mca/oob/ud/oob_ud_req.c
Просмотреть файл

@ -4,7 +4,7 @@
* reserved. * reserved.
* 2014 Mellanox Technologies, Inc. * 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -287,10 +287,11 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
case MCA_OOB_UD_REQ_SEND: case MCA_OOB_UD_REQ_SEND:
if (req->req_data_type != MCA_OOB_UD_REQ_TR) { if (req->req_data_type != MCA_OOB_UD_REQ_TR) {
req->rml_msg->status = rc; req->rml_msg->status = rc;
if( NULL == req->rml_msg->channel) if( NULL == req->rml_msg->channel) {
ORTE_RML_SEND_COMPLETE(req->rml_msg); ORTE_RML_SEND_COMPLETE(req->rml_msg);
else } else {
ORTE_QOS_SEND_COMPLETE(req->rml_msg); ORTE_QOS_SEND_COMPLETE(req->rml_msg);
}
} }
break; break;
case MCA_OOB_UD_REQ_RECV: case MCA_OOB_UD_REQ_RECV:
@ -323,7 +324,7 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
snd->origin = req->req_origin; snd->origin = req->req_origin;
snd->tag = req->req_tag; snd->tag = req->req_tag;
snd->dst_channel = req->req_channel; snd->dst_channel = req->req_channel;
snd->seq_num = req->req_seqnum; snd->seq_num = req->req_seq_num;
if (MCA_OOB_UD_REQ_IOV == req->req_data_type) { if (MCA_OOB_UD_REQ_IOV == req->req_data_type) {
char *data = (char *)calloc(req->req_data.iov.count, sizeof(struct iovec)); char *data = (char *)calloc(req->req_data.iov.count, sizeof(struct iovec));
int datalen = 0; int datalen = 0;

11
orte/mca/oob/ud/oob_ud_send.c
Просмотреть файл

@ -4,7 +4,7 @@
* reserved. * reserved.
* 2014 Mellanox Technologies, Inc. * 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -108,10 +108,11 @@ static int mca_oob_ud_send_self (orte_rml_send_t *msg)
req->rml_msg->status = ORTE_SUCCESS; req->rml_msg->status = ORTE_SUCCESS;
if( NULL == req->rml_msg->channel) if( NULL == req->rml_msg->channel) {
ORTE_RML_SEND_COMPLETE(req->rml_msg->msg); ORTE_RML_SEND_COMPLETE(req->rml_msg);
else } else {
ORTE_QOS_SEND_COMPLETE(req->rml_msg->msg); ORTE_QOS_SEND_COMPLETE(req->rml_msg);
}
return size; return size;
} }