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

Some indentation and code arrangement. However, there is a bug fix. Force the PUT

Просмотр исходного кода 
protocol to always obey to the btl_max_rdma_size.

This commit was SVN r12721.
Этот коммит содержится в:
George Bosilca 2006-12-01 22:26:14 +00:00
родитель 3e3689320b
Коммит 3edd850d2e
2 изменённых файлов: 25 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ompi/mca/pml/ob1/pml_ob1_recvfrag.c
Просмотреть файл

@ -126,8 +126,7 @@ void mca_pml_ob1_recv_frag_callback(
MCA_PML_OB1_ACK_HDR_NTOH(hdr->hdr_ack); MCA_PML_OB1_ACK_HDR_NTOH(hdr->hdr_ack);
} }
#endif #endif
sendreq = (mca_pml_ob1_send_request_t*) sendreq = (mca_pml_ob1_send_request_t*)hdr->hdr_ack.hdr_src_req.pval;
hdr->hdr_ack.hdr_src_req.pval;
sendreq->req_recv = hdr->hdr_ack.hdr_dst_req; sendreq->req_recv = hdr->hdr_ack.hdr_dst_req;
sendreq->req_rdma_offset = (size_t)hdr->hdr_ack.hdr_rdma_offset; sendreq->req_rdma_offset = (size_t)hdr->hdr_ack.hdr_rdma_offset;
MCA_PML_OB1_SEND_REQUEST_ADVANCE(sendreq); MCA_PML_OB1_SEND_REQUEST_ADVANCE(sendreq);
@ -141,8 +140,7 @@ void mca_pml_ob1_recv_frag_callback(
MCA_PML_OB1_FRAG_HDR_NTOH(hdr->hdr_frag); MCA_PML_OB1_FRAG_HDR_NTOH(hdr->hdr_frag);
} }
#endif #endif
recvreq = (mca_pml_ob1_recv_request_t*) recvreq = (mca_pml_ob1_recv_request_t*)hdr->hdr_frag.hdr_dst_req.pval;
hdr->hdr_frag.hdr_dst_req.pval;
mca_pml_ob1_recv_request_progress(recvreq,btl,segments,des->des_dst_cnt); mca_pml_ob1_recv_request_progress(recvreq,btl,segments,des->des_dst_cnt);
break; break;
} }
@ -155,8 +153,7 @@ void mca_pml_ob1_recv_frag_callback(
we remember if we ever change the bml. */ we remember if we ever change the bml. */
assert(0 == (hdr->hdr_common.hdr_flags & MCA_PML_OB1_HDR_FLAGS_NBO)); assert(0 == (hdr->hdr_common.hdr_flags & MCA_PML_OB1_HDR_FLAGS_NBO));
#endif #endif
sendreq = (mca_pml_ob1_send_request_t*) sendreq = (mca_pml_ob1_send_request_t*)hdr->hdr_rdma.hdr_req.pval;
hdr->hdr_rdma.hdr_req.pval;
mca_pml_ob1_send_request_put(sendreq,btl,&hdr->hdr_rdma); mca_pml_ob1_send_request_put(sendreq,btl,&hdr->hdr_rdma);
break; break;
} }
@ -168,8 +165,7 @@ void mca_pml_ob1_recv_frag_callback(
MCA_PML_OB1_FIN_HDR_NTOH(hdr->hdr_fin); MCA_PML_OB1_FIN_HDR_NTOH(hdr->hdr_fin);
} }
#endif #endif
rdma = (mca_btl_base_descriptor_t*) rdma = (mca_btl_base_descriptor_t*)hdr->hdr_fin.hdr_des.pval;
hdr->hdr_fin.hdr_des.pval;
rdma->des_cbfunc(btl, NULL, rdma, OMPI_SUCCESS); rdma->des_cbfunc(btl, NULL, rdma, OMPI_SUCCESS);
break; break;
} }

53
ompi/mca/pml/ob1/pml_ob1_recvreq.c
Просмотреть файл

@ -133,11 +133,10 @@ OBJ_CLASS_INSTANCE(
* Release resources. * Release resources.
*/ */
static void mca_pml_ob1_recv_ctl_completion( static void mca_pml_ob1_recv_ctl_completion( mca_btl_base_module_t* btl,
mca_btl_base_module_t* btl, struct mca_btl_base_endpoint_t* ep,
struct mca_btl_base_endpoint_t* ep, struct mca_btl_base_descriptor_t* des,
struct mca_btl_base_descriptor_t* des, int status )
int status)
{ {
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context; mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context;
MCA_BML_BASE_BTL_DES_RETURN(bml_btl, des); MCA_BML_BASE_BTL_DES_RETURN(bml_btl, des);
@ -149,11 +148,10 @@ static void mca_pml_ob1_recv_ctl_completion(
* Put operation has completed remotely - update request status * Put operation has completed remotely - update request status
*/ */
static void mca_pml_ob1_put_completion( static void mca_pml_ob1_put_completion( mca_btl_base_module_t* btl,
mca_btl_base_module_t* btl, struct mca_btl_base_endpoint_t* ep,
struct mca_btl_base_endpoint_t* ep, struct mca_btl_base_descriptor_t* des,
struct mca_btl_base_descriptor_t* des, int status )
int status)
{ {
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context; mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context;
mca_pml_ob1_recv_request_t* recvreq = (mca_pml_ob1_recv_request_t*)des->des_cbdata; mca_pml_ob1_recv_request_t* recvreq = (mca_pml_ob1_recv_request_t*)des->des_cbdata;
@ -237,7 +235,6 @@ static int mca_pml_ob1_recv_request_ack(
bml_endpoint = (mca_bml_base_endpoint_t*) proc->proc_bml; bml_endpoint = (mca_bml_base_endpoint_t*) proc->proc_bml;
if(hdr->hdr_msg_length > bytes_received) { if(hdr->hdr_msg_length > bytes_received) {
/* by default copy */ /* by default copy */
@ -263,11 +260,11 @@ static int mca_pml_ob1_recv_request_ack(
/* start rdma at current fragment offset - no need to ack */ /* start rdma at current fragment offset - no need to ack */
recvreq->req_rdma_offset = bytes_received; recvreq->req_rdma_offset = bytes_received;
return OMPI_SUCCESS; return OMPI_SUCCESS;
}
/* are rdma devices available for long rdma protocol */ /* are rdma devices available for long rdma protocol */
} else if (mca_pml_ob1.leave_pinned_pipeline && if( mca_pml_ob1.leave_pinned_pipeline &&
hdr->hdr_msg_length > bml_endpoint->btl_rdma_size && hdr->hdr_msg_length > bml_endpoint->btl_rdma_size &&
mca_bml_base_btl_array_get_size(&bml_endpoint->btl_rdma)) { mca_bml_base_btl_array_get_size(&bml_endpoint->btl_rdma) ) {
char* base; char* base;
char* align; char* align;
ptrdiff_t lb; ptrdiff_t lb;
@ -288,8 +285,7 @@ static int mca_pml_ob1_recv_request_ack(
ompi_convertor_set_position( &recvreq->req_recv.req_convertor, ompi_convertor_set_position( &recvreq->req_recv.req_convertor,
&recvreq->req_rdma_offset ); &recvreq->req_rdma_offset );
} }
/* are rdma devices available for long rdma protocol */ /* are rdma devices available for long rdma protocol */
} else if (!mca_pml_ob1.leave_pinned_pipeline && } else if (!mca_pml_ob1.leave_pinned_pipeline &&
bml_endpoint->btl_rdma_offset < hdr->hdr_msg_length && bml_endpoint->btl_rdma_offset < hdr->hdr_msg_length &&
@ -520,7 +516,6 @@ void mca_pml_ob1_recv_request_progress(
bytes_received, bytes_received,
bytes_delivered); bytes_delivered);
} }
break; break;
case MCA_PML_OB1_HDR_TYPE_RGET: case MCA_PML_OB1_HDR_TYPE_RGET:
@ -547,7 +542,6 @@ void mca_pml_ob1_recv_request_progress(
default: default:
break; break;
} }
/* check completion status */ /* check completion status */
if( OPAL_THREAD_ADD_SIZE_T(&recvreq->req_bytes_received, bytes_received) if( OPAL_THREAD_ADD_SIZE_T(&recvreq->req_bytes_received, bytes_received)
>= recvreq->req_recv.req_bytes_packed ) { >= recvreq->req_recv.req_bytes_packed ) {
@ -601,12 +595,10 @@ void mca_pml_ob1_recv_request_matched_probe(
* *
*/ */
int mca_pml_ob1_recv_request_schedule_exclusive( int mca_pml_ob1_recv_request_schedule_exclusive( mca_pml_ob1_recv_request_t* recvreq )
mca_pml_ob1_recv_request_t* recvreq)
{ {
ompi_proc_t* proc = recvreq->req_recv.req_base.req_proc; ompi_proc_t* proc = recvreq->req_recv.req_base.req_proc;
mca_bml_base_endpoint_t* bml_endpoint = mca_bml_base_endpoint_t* bml_endpoint = (mca_bml_base_endpoint_t*) proc->proc_bml;
(mca_bml_base_endpoint_t*) proc->proc_bml;
mca_bml_base_btl_t* bml_btl; mca_bml_base_btl_t* bml_btl;
int num_btl_avail = int num_btl_avail =
mca_bml_base_btl_array_get_size(&bml_endpoint->btl_rdma); mca_bml_base_btl_array_get_size(&bml_endpoint->btl_rdma);
@ -621,8 +613,8 @@ int mca_pml_ob1_recv_request_schedule_exclusive(
size_t prev_bytes_remaining = 0; size_t prev_bytes_remaining = 0;
int num_fail = 0; int num_fail = 0;
while(bytes_remaining > 0 && while( bytes_remaining > 0 &&
recvreq->req_pipeline_depth < mca_pml_ob1.recv_pipeline_depth) { recvreq->req_pipeline_depth < mca_pml_ob1.recv_pipeline_depth ) {
size_t hdr_size; size_t hdr_size;
size_t size; size_t size;
mca_pml_ob1_rdma_hdr_t* hdr; mca_pml_ob1_rdma_hdr_t* hdr;
@ -676,8 +668,8 @@ int mca_pml_ob1_recv_request_schedule_exclusive(
* If more than one NIC is available - try to use both for * If more than one NIC is available - try to use both for
* anything larger than the eager limit * anything larger than the eager limit
*/ */
if(num_btl_avail == 1 || if( num_btl_avail == 1 ||
bytes_remaining < bml_btl->btl_eager_limit) { bytes_remaining < bml_btl->btl_eager_limit ) {
size = bytes_remaining; size = bytes_remaining;
} else { } else {
/* /*
@ -691,9 +683,7 @@ int mca_pml_ob1_recv_request_schedule_exclusive(
} }
/* makes sure that we don't exceed BTL max rdma size /* makes sure that we don't exceed BTL max rdma size
* if memory is not pinned already */ * if memory is not pinned already */
if(0 == recvreq->req_rdma_cnt && if( size > bml_btl->btl_max_rdma_size ) {
bml_btl->btl_max_rdma_size != 0 &&
size > bml_btl->btl_max_rdma_size) {
size = bml_btl->btl_max_rdma_size; size = bml_btl->btl_max_rdma_size;
} }
@ -716,7 +706,6 @@ int mca_pml_ob1_recv_request_schedule_exclusive(
/* prepare a descriptor for RDMA */ /* prepare a descriptor for RDMA */
mca_bml_base_prepare_dst(bml_btl, reg, mca_bml_base_prepare_dst(bml_btl, reg,
&recvreq->req_recv.req_convertor, 0, &size, &dst); &recvreq->req_recv.req_convertor, 0, &size, &dst);
if(reg && release == true && NULL != bml_btl->btl_mpool) { if(reg && release == true && NULL != bml_btl->btl_mpool) {
bml_btl->btl_mpool->mpool_release(bml_btl->btl_mpool, reg); bml_btl->btl_mpool->mpool_release(bml_btl->btl_mpool, reg);
} }