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

mtl-portals4: Correct how the request_status._ucount is set

Просмотр исходного кода
Этот коммит содержится в:
Pascal Deveze 2016-07-26 08:42:48 +02:00
родитель 3ca194f10a
Коммит 9e58b4842f
1 изменённых файлов: 5 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
ompi/mca/mtl/portals4/mtl_portals4_recv.c
Просмотреть файл

@ -113,6 +113,7 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->hdr_data = ev->hdr_data; ptl_request->hdr_data = ev->hdr_data;
#endif #endif
ptl_request->super.super.ompi_req->req_status._ucount = ev->mlength;
if (!MTL_PORTALS4_IS_SHORT_MSG(ev->match_bits) && ompi_mtl_portals4.protocol == rndv) { if (!MTL_PORTALS4_IS_SHORT_MSG(ev->match_bits) && ompi_mtl_portals4.protocol == rndv) {
/* If it's not a short message and we're doing rndv, we /* If it's not a short message and we're doing rndv, we
only have the first part of the message. Issue the get only have the first part of the message. Issue the get
@ -142,8 +143,6 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
__FILE__, __LINE__, ret); __FILE__, __LINE__, ret);
ptl_request->super.super.ompi_req->req_status.MPI_ERROR = ret; ptl_request->super.super.ompi_req->req_status.MPI_ERROR = ret;
} }
ptl_request->super.super.ompi_req->req_status._ucount = ev->mlength;
OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_framework.framework_output, OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_framework.framework_output,
"Recv %lu (0x%lx) completed, expected", "Recv %lu (0x%lx) completed, expected",
ptl_request->opcount, ptl_request->hdr_data)); ptl_request->opcount, ptl_request->hdr_data));
@ -166,11 +165,7 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
/* set the received length in the status, now that we know /* set the received length in the status, now that we know
excatly how much data was sent. */ excatly how much data was sent. */
ptl_request->super.super.ompi_req->req_status._ucount = ev->mlength; ptl_request->super.super.ompi_req->req_status._ucount += ev->mlength;
if (ompi_mtl_portals4.protocol == rndv) {
ptl_request->super.super.ompi_req->req_status._ucount +=
ompi_mtl_portals4.eager_limit;
}
#if OMPI_MTL_PORTALS4_FLOW_CONTROL #if OMPI_MTL_PORTALS4_FLOW_CONTROL
OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, 1); OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, 1);
@ -281,10 +276,9 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
ptl_request->super.super.completion_callback(&ptl_request->super.super); ptl_request->super.super.completion_callback(&ptl_request->super.super);
} else { } else {
if (ev->mlength > 0) {
/* if rndv or triggered, copy the eager part to the right place */ /* For long messages in the overflow list, ev->mlength = 0 */
memcpy(ptl_request->delivery_ptr, ev->start, ev->mlength); ptl_request->super.super.ompi_req->req_status._ucount = 0;
}
ret = read_msg((char*) ptl_request->delivery_ptr + ev->mlength, ret = read_msg((char*) ptl_request->delivery_ptr + ev->mlength,
((msg_length > ptl_request->delivery_len) ? ((msg_length > ptl_request->delivery_len) ?